Commit 0de4b954 authored Aug 08, 2012 by Jesper Juhl Committed by Jiri Kosina Sep 01, 2012

doc: getdelays.c: remember to close() socket on error in create_nl_socket()



If the call to setsockopt() fails in
Documentation/accounting/getdelays.c::create_nl_socket() we return -1
without closing the socket, thus leaking it when the 'fd' variable
goes out of scope.

Easily fixed by just jumping to the 'error' label instead of returning
since we do the proper cleanup there.

While I was there I noticed that the error message that is printet if
setsockopt() fails was broken over two lines - put that on a single
line so it is easier to grep for.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 5ffd27fa

Documentation/accounting/getdelays.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -98,10 +98,9 @@ static int create_nl_socket(int protocol)
		if (rcvbufsz)
		if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
		&rcvbufsz, sizeof(rcvbufsz)) < 0) {
		fprintf(stderr, "Unable to set socket rcv buf size "
		"to %d\n",
		fprintf(stderr, "Unable to set socket rcv buf size to %d\n",
		rcvbufsz);
		return -1;
		goto error;
		}

		memset(&local, 0, sizeof(local));

Admin message