diff options
| author | YoungHyun Yoo <yooyoo.yoo@samsung.com> | 2016-08-25 11:15:24 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2016-09-29 09:57:27 +0200 |
| commit | 29086f45a45f0ef51a27462a2f693766a4e000e8 (patch) | |
| tree | 384a7db044905fee45615d5e5ce99c97b012760d | |
| parent | 9fd57cad8a0f1e0c7a342f014e1cc8ee31d72261 (diff) | |
| download | kexec-tools-29086f45a45f0ef51a27462a2f693766a4e000e8.tar.gz | |
kexec: socket not released when error situation occur.
Fix resourceleek in ifdown function when error occur.
Signed-off-by: YoungHyun Yoo <yooyoo.yoo@samsung.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/ifdown.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/kexec/ifdown.c b/kexec/ifdown.c index 46b7bef0..9679ad75 100644 --- a/kexec/ifdown.c +++ b/kexec/ifdown.c @@ -1,6 +1,6 @@ /* - * ifdown.c Find all network interfaces on the system and - * shut them down. + * ifdown.c Find all network interfaces on the system and + * shut them down. * */ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; @@ -20,10 +20,10 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; #include <netinet/in.h> /* - * First, we find all shaper devices and down them. Then we - * down all real interfaces. This is because the comment in the - * shaper driver says "if you down the shaper device before the - * attached inerface your computer will follow". + * First, we find all shaper devices and down them. Then we + * down all real interfaces. This is because the comment in the + * shaper driver says "if you down the shaper device before the + * attached inerface your computer will follow". */ int ifdown(void) { @@ -34,13 +34,13 @@ int ifdown(void) if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { fprintf(stderr, "ifdown: "); perror("socket"); - return -1; + goto error; } if ((ifa = if_nameindex()) == NULL) { fprintf(stderr, "ifdown: "); perror("if_nameindex"); - return -1; + goto error; } for (shaper = 1; shaper >= 0; shaper--) { @@ -57,18 +57,22 @@ int ifdown(void) if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { fprintf(stderr, "ifdown: shutdown "); perror(ifp->if_name); - return -1; + goto error; } ifr.ifr_flags &= ~(IFF_UP); if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { fprintf(stderr, "ifdown: shutdown "); perror(ifp->if_name); - return -1; + goto error; } } } - close(fd); + close(fd); return 0; + +error: + close(fd); + return -1; } |