> > @@ -72,6 +72,11 @@ int find_mount_root(const char *path, char **mount_root)
> > close(fd);
> >
> > mnttab = fopen("/proc/mounts", "r");
> > + if (!mnttab) {
> > + close(fd);
> > + return -errno;
>
> close() can modify errno.
>
> And close(fd) is already called 4 lines above. You didn't run the static
> code analysis again after applying your patch :)
OK, here's a less dumb attempt:
- z
>From f8a3425c184a55e0c254143e520e60a6856c27da Mon Sep 17 00:00:00 2001
From: Zach Brown <zab@xxxxxxxxxx>
Date: Fri, 4 Oct 2013 15:38:18 -0700
Subject: [PATCH] btrfs-progs: check fopen failure in cmds-send
Check for fopen() failure. This shows up in static analysis as a
possible null pointer derference.
Signed-off-by: Zach Brown <zab@xxxxxxxxxx>
Laughed-at-by: Stefan Behrens <sbehrens@xxxxxxxxxxxxxxxx>
---
cmds-send.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/cmds-send.c b/cmds-send.c
index 374d040..81b3e49 100644
--- a/cmds-send.c
+++ b/cmds-send.c
@@ -72,6 +72,9 @@ int find_mount_root(const char *path, char **mount_root)
close(fd);
mnttab = fopen("/proc/mounts", "r");
+ if (!mnttab)
+ return -errno;
+
while ((ent = getmntent(mnttab))) {
len = strlen(ent->mnt_dir);
if (strncmp(ent->mnt_dir, path, len) == 0) {
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
