From: Zach Brown <zab@redhat.com>
Date: Wed, 23 Jan 2013 22:36:03 +0000 (-0800)
Subject: btrfs-progs: fix scrub socket leak
X-Git-Tag: upstream/4.16.1~3459^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb4c601a4e7cf33102a0667799eb0ec603067ee8;hp=09fac3824db462368f24d3dd4deccafedf5b3c8c;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: fix scrub socket leak

If connection fails the socket is leaked when the status file is used
instead.  Close it to trivially cut down on fd use and to bring down the
noise in static code analysis.

Signed-off-by: Zach Brown <zab@redhat.com>
---

diff --git a/cmds-scrub.c b/cmds-scrub.c
index efdfdb4..70d2683 100644
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -1584,6 +1584,7 @@ static int cmd_scrub_status(int argc, char **argv)
 	addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
 	ret = connect(fdres, (struct sockaddr *)&addr, sizeof(addr));
 	if (ret == -1) {
+		close(fdres);
 		fdres = scrub_open_file_r(SCRUB_DATA_FILE, fsid);
 		if (fdres < 0 && fdres != -ENOENT) {
 			fprintf(stderr, "WARNING: failed to open status file: "