diff options
-rw-r--r-- | NOFORK_NOEXEC.lst | 2 | ||||
-rw-r--r-- | networking/nbd-client.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst index 63ec08643..9c8df23ab 100644 --- a/NOFORK_NOEXEC.lst +++ b/NOFORK_NOEXEC.lst | |||
@@ -241,7 +241,7 @@ mpstat - longterm: "mpstat 1" runs indefinitely | |||
241 | mt - rare | 241 | mt - rare |
242 | mv - noexec candidate, runner | 242 | mv - noexec candidate, runner |
243 | nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die | 243 | nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die |
244 | nbd-client | 244 | nbd-client - noexec |
245 | nc - runner | 245 | nc - runner |
246 | netstat - runner with -c | 246 | netstat - runner with -c |
247 | nice - noexec. spawner | 247 | nice - noexec. spawner |
diff --git a/networking/nbd-client.c b/networking/nbd-client.c index a5e25e6aa..cf1857231 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <netinet/tcp.h> | 7 | #include <netinet/tcp.h> |
8 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
9 | 9 | ||
10 | //applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient)) | 10 | //applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient)) |
11 | 11 | ||
12 | //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o | 12 | //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o |
13 | 13 | ||
@@ -43,7 +43,7 @@ | |||
43 | //blocksizes other than 1024 without patches | 43 | //blocksizes other than 1024 without patches |
44 | 44 | ||
45 | int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 45 | int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
46 | int nbdclient_main(int argc, char **argv) | 46 | int nbdclient_main(int argc UNUSED_PARAM, char **argv) |
47 | { | 47 | { |
48 | unsigned long timeout = 0; | 48 | unsigned long timeout = 0; |
49 | #if BB_MMU | 49 | #if BB_MMU |
@@ -61,7 +61,7 @@ int nbdclient_main(int argc, char **argv) | |||
61 | BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); | 61 | BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); |
62 | 62 | ||
63 | // Parse command line stuff (just a stub now) | 63 | // Parse command line stuff (just a stub now) |
64 | if (argc != 4) | 64 | if (!argv[1] || !argv[2] || !argv[3] || argv[4]) |
65 | bb_show_usage(); | 65 | bb_show_usage(); |
66 | 66 | ||
67 | #if !BB_MMU | 67 | #if !BB_MMU |