|
 |
dfa500 |
From: Florian Weimer <fweimer@redhat.com>
|
|
|
dfa500 |
Date: Tue, 21 Jan 2020 16:11:01 +0000 (+0100)
|
|
|
dfa500 |
Subject: resolv: Fix file handle leak in __resolv_conf_load [BZ #25429]
|
|
|
dfa500 |
X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=a1a20f029299dc27170912bb9233070c8403444d
|
|
|
dfa500 |
|
|
|
dfa500 |
resolv: Fix file handle leak in __resolv_conf_load [BZ #25429]
|
|
|
dfa500 |
|
|
|
dfa500 |
res_vinit_1 did not close the stream on errors, only on success.
|
|
|
dfa500 |
This change moves closing the stream to __resolv_conf_load, for both
|
|
|
dfa500 |
the success and error cases.
|
|
|
dfa500 |
|
|
|
dfa500 |
Fixes commit 89f187a40fc0ad4e22838526bfe34d73f758b776 ("resolv: Use
|
|
|
dfa500 |
getline for configuration file reading in res_vinit_1") and commit
|
|
|
dfa500 |
3f853f22c87f0b671c0366eb290919719fa56c0e ("resolv: Lift domain search
|
|
|
dfa500 |
list limits [BZ #19569] [BZ #21475]"), where memory allocation was
|
|
|
dfa500 |
introduced into res_vinit_1.
|
|
|
dfa500 |
|
|
|
dfa500 |
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
dfa500 |
---
|
|
|
dfa500 |
|
|
|
dfa500 |
diff --git a/resolv/res_init.c b/resolv/res_init.c
|
|
|
dfa500 |
index 95dce098aa..09345718cd 100644
|
|
|
dfa500 |
--- a/resolv/res_init.c
|
|
|
dfa500 |
+++ b/resolv/res_init.c
|
|
|
dfa500 |
@@ -508,7 +508,6 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser)
|
|
|
dfa500 |
continue;
|
|
|
dfa500 |
}
|
|
|
dfa500 |
}
|
|
|
dfa500 |
- fclose (fp);
|
|
|
dfa500 |
}
|
|
|
dfa500 |
if (__glibc_unlikely (nameserver_list_size (&parser->nameserver_list) == 0))
|
|
|
dfa500 |
{
|
|
|
dfa500 |
@@ -593,6 +592,13 @@ __resolv_conf_load (struct __res_state *preinit)
|
|
|
dfa500 |
}
|
|
|
dfa500 |
resolv_conf_parser_free (&parser);
|
|
|
dfa500 |
|
|
|
dfa500 |
+ if (fp != NULL)
|
|
|
dfa500 |
+ {
|
|
|
dfa500 |
+ int saved_errno = errno;
|
|
|
dfa500 |
+ fclose (fp);
|
|
|
dfa500 |
+ __set_errno (saved_errno);
|
|
|
dfa500 |
+ }
|
|
|
dfa500 |
+
|
|
|
dfa500 |
return conf;
|
|
|
dfa500 |
}
|
|
|
dfa500 |
|