The getuid only shows the UID of the current user. But the EUID is relevant for accessing the debugfs and sysfs files. This check is still to strict when it comes to netlink but avoids a lot of bogus warnings like

Error received: Operation not permitted Error - mesh has not been enabled yet Activate your mesh by adding interfaces to batman-adv

when only the euid of the process was 0 but the interface was actually working.

Signed-off-by: Sven Eckelmann sven@narfation.org --- functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.c b/functions.c index c1aaf12..2239440 100644 --- a/functions.c +++ b/functions.c @@ -1141,7 +1141,7 @@ void get_random_bytes(void *buf, size_t buflen)

void check_root_or_die(const char *cmd) { - if (getuid() || getgid()) { + if (geteuid() != 0) { fprintf(stderr, "Error - you must be root to run '%s' !\n", cmd); exit(EXIT_FAILURE); }

It is a long standing TODO to move the root check to each batctl sub-application. This will allow later to make the checks specific to the requirements for each function instead of disallowing the use of batctl for non-root users completely.

Signed-off-by: Sven Eckelmann sven@narfation.org --- debug.c | 6 ++++++ interface.c | 2 ++ ioctl.c | 3 +++ main.c | 5 ----- ping.c | 2 ++ sys.c | 8 ++++++++ tcpdump.c | 2 ++ tp_meter.c | 2 ++ traceroute.c | 2 ++ translate.c | 2 ++ 10 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/debug.c b/debug.c index ee04928..07a91c4 100644 --- a/debug.c +++ b/debug.c @@ -219,6 +219,8 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } }

+ check_root_or_die("batctl"); + if (read_opt & UNICAST_ONLY && read_opt & MULTICAST_ONLY) { fprintf(stderr, "Error - '-u' and '-m' are exclusive options\n"); debug_table_usage(debug_table); @@ -270,6 +272,8 @@ int print_vis_info(char *mesh_iface) char *debugfs_mnt; FILE *fp;

+ check_root_or_die("batctl vis_data"); + debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { fprintf(stderr, "Error - can't mount or find debugfs\n"); @@ -318,6 +322,8 @@ int log_print(char *mesh_iface, int argc, char **argv) } }

+ check_root_or_die("batctl log"); + debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { fprintf(stderr, "Error - can't mount or find debugfs\n"); diff --git a/interface.c b/interface.c index 8cc4f92..01ee6fc 100644 --- a/interface.c +++ b/interface.c @@ -324,6 +324,8 @@ int interface(char *mesh_iface, int argc, char **argv) } }

+ check_root_or_die("batctl interface"); + rest_argc = argc - optind; rest_argv = &argv[optind];

diff --git a/ioctl.c b/ioctl.c index b1db5e4..2ef4f8b 100644 --- a/ioctl.c +++ b/ioctl.c @@ -33,6 +33,7 @@ #include <linux/ethtool.h> #include <stdint.h>

+#include "functions.h" #include "ioctl.h"

/* code borrowed from ethtool */ @@ -104,6 +105,8 @@ int ioctl_statistics_get(char *mesh_iface) struct ifreq ifr; int fd = -1, ret = EXIT_FAILURE;

+ check_root_or_die("batctl statistics"); + memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, mesh_iface, sizeof(ifr.ifr_name)); ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; diff --git a/main.c b/main.c index 2fc9b75..02d89c4 100644 --- a/main.c +++ b/main.c @@ -134,11 +134,6 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); }

- /* TODO: remove this generic check here and move it into the individual functions */ - /* check if user is root */ - if (strncmp(argv[1], "bisect", strlen("bisect")) != 0) - check_root_or_die(argv[0]); - if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) {

ret = interface(mesh_iface, argc - 1, argv + 1); diff --git a/ping.c b/ping.c index 4fef663..4f83afe 100644 --- a/ping.c +++ b/ping.c @@ -133,6 +133,8 @@ int ping(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; }

+ check_root_or_die("batctl ping"); + dst_string = argv[found_args]; bat_hosts_init(0); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/sys.c b/sys.c index 7817234..9dcb4f2 100644 --- a/sys.c +++ b/sys.c @@ -152,6 +152,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) } }

+ check_root_or_die("batctl loglevel"); + path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface);

@@ -251,6 +253,8 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) } }

+ check_root_or_die("batctl"); + /* prepare the classic path */ path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); @@ -324,6 +328,8 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) } }

+ check_root_or_die("batctl gw_mode"); + path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface);

@@ -449,6 +455,8 @@ int handle_ra_setting(int argc, char **argv) } }

+ check_root_or_die("batctl routing_algo"); + if (argc == 2) { res = write_file(SYS_SELECTED_RA_PATH, "", argv[1], NULL); goto out; diff --git a/tcpdump.c b/tcpdump.c index c7e0cbc..d52a451 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1165,6 +1165,8 @@ int tcpdump(int argc, char **argv) return EXIT_FAILURE; }

+ check_root_or_die("batctl tcpdump"); + bat_hosts_init(read_opt);

/* init interfaces list */ diff --git a/tp_meter.c b/tp_meter.c index 4f4122c..918fb79 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -432,6 +432,8 @@ int tp_meter(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; }

+ check_root_or_die("batctl throughputmeter"); + dst_string = argv[found_args]; bat_hosts_init(read_opt); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/traceroute.c b/traceroute.c index e7c55ef..124ce7c 100644 --- a/traceroute.c +++ b/traceroute.c @@ -94,6 +94,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; }

+ check_root_or_die("batctl traceroute"); + dst_string = argv[found_args]; bat_hosts_init(read_opt); bat_host = bat_hosts_find_by_name(dst_string); diff --git a/translate.c b/translate.c index 18bde4d..31da3a3 100644 --- a/translate.c +++ b/translate.c @@ -46,6 +46,8 @@ int translate(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; }

+ check_root_or_die("batctl translate"); + dst_string = argv[1]; bat_hosts_init(0); bat_host = bat_hosts_find_by_name(dst_string);

The loglevel sysfs file can be read by normal users. Only writing to this file is restricted. Don't artificially restrict access to this file by the batctl subcommand.

Signed-off-by: Sven Eckelmann sven@narfation.org --- sys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys.c b/sys.c index 9dcb4f2..ac978bf 100644 --- a/sys.c +++ b/sys.c @@ -152,12 +152,12 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) } }

- check_root_or_die("batctl loglevel"); - path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface);

if (argc != 1) { + check_root_or_die("batctl loglevel"); + for (i = 1; i < argc; i++) { if (strcmp(argv[i], "none") == 0) { log_level = 0;

The sysfs files can be read by normal users. Only writing to these files is restricted. Don't artificially restrict access to these files by the batctl subcommands.

Signed-off-by: Sven Eckelmann sven@narfation.org --- sys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys.c b/sys.c index a695c18..65b438c 100644 --- a/sys.c +++ b/sys.c @@ -253,8 +253,6 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) } }

- check_root_or_die("batctl"); - /* prepare the classic path */ path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); @@ -272,6 +270,8 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) goto out; }

+ check_root_or_die("batctl"); + if (!batctl_settings[setting].params) goto write_file;