cd256e1c4
Denys Vlasenko
2013-10-06
Subject
wall: access FILE under real user's credentials
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.src.h +0 -2miscutils/Config.src +0 -7miscutils/Kbuild.src +0 -1miscutils/wall.c +24 -1
include/applets.src.h+0 -2
| @@ -407,8 +407,6 @@ IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP)) | |
| /* Needs to be run by root or be suid root - needs to change uid and gid: */ | |
| IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) | |
| IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */ |
| - | IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) |
| IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
miscutils/Config.src+0 -7
| @@ -591,13 +591,6 @@ config VOLNAME | |
| help | |
| Prints a CD-ROM volume name. | |
| - | config WALL |
| - | bool "wall" |
| - | default y |
| - | depends on FEATURE_UTMP |
| - | help |
| - | Write a message to all users that are logged in. |
| - | |
| config WATCHDOG | |
| bool "watchdog" | |
| default y | |
miscutils/Kbuild.src+0 -1
| @@ -46,5 +46,4 @@ lib-$(CONFIG_TIME) += time.o | |
| lib-$(CONFIG_TIMEOUT) += timeout.o | |
| lib-$(CONFIG_TTYSIZE) += ttysize.o | |
| lib-$(CONFIG_VOLNAME) += volname.o | |
| - | lib-$(CONFIG_WALL) += wall.o |
| lib-$(CONFIG_WATCHDOG) += watchdog.o | |
miscutils/wall.c+24 -1
| @@ -6,6 +6,18 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. | |
| */ | |
| + | //config:config WALL |
| + | //config: bool "wall" |
| + | //config: default y |
| + | //config: depends on FEATURE_UTMP |
| + | //config: help |
| + | //config: Write a message to all users that are logged in. |
| + | |
| + | /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */ |
| + | //applet:IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) |
| + | |
| + | //kbuild:lib-$(CONFIG_WALL) += wall.o |
| + | |
| //usage:#define wall_trivial_usage | |
| //usage: "[FILE]" | |
| //usage:#define wall_full_usage "\n\n" | |
| @@ -22,8 +34,19 @@ int wall_main(int argc UNUSED_PARAM, char **argv) | |
| { | |
| struct utmp *ut; | |
| char *msg; | |
| - | int fd = argv[1] ? xopen(argv[1], O_RDONLY) : STDIN_FILENO; |
| + | int fd; |
| + | fd = STDIN_FILENO; |
| + | if (argv[1]) { |
| + | /* The applet is setuid. |
| + | * Access to the file must be under user's uid/gid. |
| + | */ |
| + | setfsuid(getuid()); |
| + | setfsgid(getgid()); |
| + | fd = xopen(argv[1], O_RDONLY); |
| + | setfsuid(geteuid()); |
| + | setfsgid(getegid()); |
| + | } |
| msg = xmalloc_read(fd, NULL); | |
| if (ENABLE_FEATURE_CLEAN_UP && argv[1]) | |
| close(fd); | |