aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-10-09 13:43:32 -0500
committerRob Landley <rob@landley.net>2014-10-09 13:43:32 -0500
commit3d56716d362d6a827c5f81029ac64c71b56a2f5c (patch)
tree93377ffa6621214916c82b0985483e4d13822336
parent7196d758a0728bd43451f869eb85528b6cd20bea (diff)
downloadtoybox-3d56716d362d6a827c5f81029ac64c71b56a2f5c.tar.gz
Various bugfixes (mostly resource leaks) from Ashwini Sharma's static analysis, plus occasional tweak by me while reviewing them.
-rw-r--r--toys/lsb/killall.c2
-rw-r--r--toys/other/ifconfig.c2
-rw-r--r--toys/other/insmod.c10
-rw-r--r--toys/other/losetup.c2
-rw-r--r--toys/posix/comm.c2
-rw-r--r--toys/posix/cp.c2
-rw-r--r--toys/posix/id.c4
7 files changed, 14 insertions, 10 deletions
diff --git a/toys/lsb/killall.c b/toys/lsb/killall.c
index f3d689b3..478f7617 100644
--- a/toys/lsb/killall.c
+++ b/toys/lsb/killall.c
@@ -40,7 +40,7 @@ static int kill_process(pid_t pid, char *name)
if (pid == TT.cur_pid) return 0;
if (toys.optflags & FLAG_i) {
- sprintf(toybuf, "Signal %4000s(%d) ?", name, (int)pid);
+ snprintf(toybuf, sizeof(toybuf), "Signal %s(%d) ?", name, (int)pid);
if (!yesno(toybuf, 0)) return 0;
}
diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c
index f5d4215e..4d5c74d0 100644
--- a/toys/other/ifconfig.c
+++ b/toys/other/ifconfig.c
@@ -6,7 +6,7 @@
*
* Not in SUSv4.
-USE_IFCONFIG(NEWTOY(ifconfig, "?a", TOYFLAG_BIN))
+USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_BIN))
config IFCONFIG
bool "ifconfig"
diff --git a/toys/other/insmod.c b/toys/other/insmod.c
index 8aa959a9..81721a31 100644
--- a/toys/other/insmod.c
+++ b/toys/other/insmod.c
@@ -22,7 +22,7 @@ void insmod_main(void)
{
char * buf = NULL;
int len, res, i;
- int fd = xopen(toys.optargs[0], O_RDONLY);
+ int fd = xopen(*toys.optargs, O_RDONLY);
len = fdlength(fd);
buf = xmalloc(len);
@@ -30,13 +30,17 @@ void insmod_main(void)
i = 1;
while(toys.optargs[i] &&
- strlen(toybuf) + strlen(toys.optargs[i]) + 2 < sizeof(toybuf)) {
+ strlen(toybuf) + strlen(toys.optargs[i]) + 2 < sizeof(toybuf))
+ {
strcat(toybuf, toys.optargs[i++]);
strcat(toybuf, " ");
}
res = init_module(buf, len, toybuf);
- if (CFG_TOYBOX_FREE && buf != toybuf) free(buf);
+ if (CFG_TOYBOX_FREE) {
+ if (buf != toybuf) free(buf);
+ close(fd);
+ }
if (res) perror_exit("failed to load %s", toys.optargs[0]);
}
diff --git a/toys/other/losetup.c b/toys/other/losetup.c
index e96a125d..e3094ef0 100644
--- a/toys/other/losetup.c
+++ b/toys/other/losetup.c
@@ -86,7 +86,7 @@ static void loopback_setup(char *device, char *file)
// Stat the loop device to see if there's a current association.
memset(loop, 0, sizeof(struct loop_info64));
if (-1 == lfd || ioctl(lfd, LOOP_GET_STATUS64, loop)) {
- if (errno == ENXIO && (flags & (FLAG_a|FLAG_j))) return;
+ if (errno == ENXIO && (flags & (FLAG_a|FLAG_j))) goto done;
if (errno != ENXIO || !file) {
perror_msg("%s", device ? device : "-f");
goto done;
diff --git a/toys/posix/comm.c b/toys/posix/comm.c
index bbdcccef..6c726cf6 100644
--- a/toys/posix/comm.c
+++ b/toys/posix/comm.c
@@ -77,5 +77,5 @@ void comm_main(void)
line[i] = get_line(file[i]);
}
- if (CFG_TOYBOX_FREE) for (i = 0; i < 2; i--) xclose(file[i]);
+ if (CFG_TOYBOX_FREE) for (i = 0; i < 2; i++) xclose(file[i]);
}
diff --git a/toys/posix/cp.c b/toys/posix/cp.c
index d73b7229..fdb7c8ae 100644
--- a/toys/posix/cp.c
+++ b/toys/posix/cp.c
@@ -119,7 +119,7 @@ int cp_node(struct dirtree *try)
} else {
// -d is only the same as -r for symlinks, not for directories
- if (S_ISLNK(try->st.st_mode) & (flags & FLAG_d)) flags |= FLAG_r;
+ if (S_ISLNK(try->st.st_mode) && (flags & FLAG_d)) flags |= FLAG_r;
// Detect recursive copies via repeated top node (cp -R .. .) or
// identical source/target (fun with hardlinks).
diff --git a/toys/posix/id.c b/toys/posix/id.c
index b4d9c00b..000d7b4c 100644
--- a/toys/posix/id.c
+++ b/toys/posix/id.c
@@ -9,7 +9,7 @@
USE_ID(NEWTOY(id, ">1nGgru[!Ggu]", TOYFLAG_BIN))
USE_GROUPS(OLDTOY(groups, id, NULL, TOYFLAG_USR|TOYFLAG_BIN))
USE_LOGNAME(OLDTOY(logname, id, ">0", TOYFLAG_BIN))
-USE_LOGNAME(OLDTOY(whoami, id, ">0", TOYFLAG_BIN))
+USE_WHOAMI(OLDTOY(whoami, id, ">0", TOYFLAG_BIN))
config ID
bool "id"
@@ -132,7 +132,7 @@ void do_id(char *username)
void id_main(void)
{
- // FLAG macros can be 0 if "id" command enabled, so snapshot them here.
+ // FLAG macros can be 0 if "id" command not enabled, so snapshot them here.
if (FLAG_u) TT.do_u = toys.optflags & FLAG_u;
if (FLAG_n) TT.do_n = toys.optflags & FLAG_n;
if (FLAG_G) TT.do_G = toys.optflags & FLAG_G;