47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
autofs-5.1.4 - fix fd leak in rpc_do_create_client()
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
Commit 94f87e203a (fix create_client() RPC client handling) fixed
|
||
|
|
possible use of an invalid RPC client handle but the change neglected
|
||
|
|
to account for a check in rpc_do_create_client() that would open a new
|
||
|
|
file descriptor without checking if the passed in descriptor was
|
||
|
|
already opened.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
lib/rpc_subs.c | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- autofs-5.1.4.orig/CHANGELOG
|
||
|
|
+++ autofs-5.1.4/CHANGELOG
|
||
|
|
@@ -24,6 +24,7 @@ xx/xx/2018 autofs-5.1.5
|
||
|
|
- add units After line to include statd service.
|
||
|
|
- use systemd sd_notify() at startup.
|
||
|
|
- fix NFS version mask usage.
|
||
|
|
+- fix fd leak in rpc_do_create_client().
|
||
|
|
|
||
|
|
19/12/2017 autofs-5.1.4
|
||
|
|
- fix spec file url.
|
||
|
|
--- autofs-5.1.4.orig/lib/rpc_subs.c
|
||
|
|
+++ autofs-5.1.4/lib/rpc_subs.c
|
||
|
|
@@ -183,7 +183,7 @@ static int rpc_do_create_client(struct s
|
||
|
|
in4_laddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||
|
|
slen = sizeof(struct sockaddr_in);
|
||
|
|
|
||
|
|
- if (!info->client) {
|
||
|
|
+ if (!info->client && *fd == RPC_ANYSOCK) {
|
||
|
|
struct sockaddr *laddr;
|
||
|
|
|
||
|
|
*fd = open_sock(addr->sa_family, type, proto);
|
||
|
|
@@ -296,7 +296,7 @@ static int rpc_do_create_client(struct s
|
||
|
|
* it would bind to a reserved port, which has been shown to
|
||
|
|
* exhaust the reserved port range in some situations.
|
||
|
|
*/
|
||
|
|
- if (!info->client) {
|
||
|
|
+ if (!info->client && *fd == RPC_ANYSOCK) {
|
||
|
|
*fd = open_sock(addr->sa_family, type, proto);
|
||
|
|
if (*fd < 0) {
|
||
|
|
ret = -errno;
|