emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd-client: make it NOEXEC, stop using argc

Browse Source 
function                                             old     new   delta
nbdclient_main                                       484     492      +8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-06 21:53:39 +02:00
parent 9536ef7c98
commit bfc66d4980
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOFORK_NOEXEC.lst
View File

@ -241,7 +241,7 @@ mpstat - longterm: "mpstat 1" runs indefinitely
mt - rare mt - rare
mv - noexec candidate, runner mv - noexec candidate, runner
nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die
nbd-client nbd-client - noexec
nc - runner nc - runner
netstat - runner with -c netstat - runner with -c
nice - noexec. spawner nice - noexec. spawner

6
networking/nbd-client.c
View File

@ -7,7 +7,7 @@
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <linux/fs.h> #include <linux/fs.h>
//applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient)) //applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
@ -43,7 +43,7 @@
//blocksizes other than 1024 without patches //blocksizes other than 1024 without patches
int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int nbdclient_main(int argc, char **argv) int nbdclient_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned long timeout = 0; unsigned long timeout = 0;
#if BB_MMU #if BB_MMU
@ -61,7 +61,7 @@ int nbdclient_main(int argc, char **argv)
BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4);
// Parse command line stuff (just a stub now) // Parse command line stuff (just a stub now)
if (argc != 4) if (!argv[1] || !argv[2] || !argv[3] || argv[4])
bb_show_usage(); bb_show_usage();
#if !BB_MMU #if !BB_MMU