On Wed, 8 Aug 2012, Jesper Juhl wrote:
> 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@xxxxxxxxxxxxx>
> ---
> Documentation/accounting/getdelays.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
> index f6318f6..6f706ac 100644
> --- a/Documentation/accounting/getdelays.c
> +++ b/Documentation/accounting/getdelays.c
> @@ -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;
> }
Now applied, thanks.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
