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

ipcrm,ipcs: make them NOEXEC

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-09 19:24:19 +02:00
parent 7943be1e13
commit c6ce1c9ca3
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util-linux/ipcrm.c
View File

@ -15,7 +15,7 @@
//config: communication (IPC) objects and the associated data structures //config: communication (IPC) objects and the associated data structures
//config: from the system. //config: from the system.
//applet:IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_IPCRM(APPLET_NOEXEC(ipcrm, ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP, ipcrm))
//kbuild:lib-$(CONFIG_IPCRM) += ipcrm.o //kbuild:lib-$(CONFIG_IPCRM) += ipcrm.o

34
util-linux/ipcs.c
View File

@ -15,26 +15,10 @@
//config: The ipcs utility is used to provide information on the currently //config: The ipcs utility is used to provide information on the currently
//config: allocated System V interprocess (IPC) objects in the system. //config: allocated System V interprocess (IPC) objects in the system.
//applet:IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_IPCS(APPLET_NOEXEC(ipcs, ipcs, BB_DIR_USR_BIN, BB_SUID_DROP, ipcs))
//kbuild:lib-$(CONFIG_IPCS) += ipcs.o //kbuild:lib-$(CONFIG_IPCS) += ipcs.o
//usage:#define ipcs_trivial_usage
//usage: "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
//usage:#define ipcs_full_usage "\n\n"
//usage: " -i Show specific resource"
//usage: "\nResource specification:"
//usage: "\n -m Shared memory segments"
//usage: "\n -q Message queues"
//usage: "\n -s Semaphore arrays"
//usage: "\n -a All (default)"
//usage: "\nOutput format:"
//usage: "\n -t Time"
//usage: "\n -c Creator"
//usage: "\n -p Pid"
//usage: "\n -l Limits"
//usage: "\n -u Summary"
/* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */ /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
/* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */ /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
/* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */ /* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */
@ -585,6 +569,22 @@ static void print_sem(int semid)
bb_putchar('\n'); bb_putchar('\n');
} }
//usage:#define ipcs_trivial_usage
//usage: "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
//usage:#define ipcs_full_usage "\n\n"
//usage: " -i Show specific resource"
//usage: "\nResource specification:"
//usage: "\n -m Shared memory segments"
//usage: "\n -q Message queues"
//usage: "\n -s Semaphore arrays"
//usage: "\n -a All (default)"
//usage: "\nOutput format:"
//usage: "\n -t Time"
//usage: "\n -c Creator"
//usage: "\n -p Pid"
//usage: "\n -l Limits"
//usage: "\n -u Summary"
int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ipcs_main(int argc UNUSED_PARAM, char **argv) int ipcs_main(int argc UNUSED_PARAM, char **argv)
{ {