commit 896ee0eee6261e30c3623be931c3f621428947df
author Kees Cook <keescook@chromium.org> Wed Mar 20 05:19:24 2013 +0000
committer David S. Miller <davem@davemloft.net> Wed Mar 20 12:23:13 2013 -0400
tree dfd1a4415493362da42b7899a2e0aee51d220498
parent fa90b077d72b4ea92706e86fdff7b5dca294caa3

net/irda: add missing error path release_sock call

This makes sure that release_sock is called for all error conditions in
irda_getsockopt.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reported-by: Brad Spengler <spender@grsecurity.net>
Cc: stable@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

net/irda/af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index d07e3a6..d28e7f0 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2583,8 +2583,10 @@
 				    NULL, NULL, NULL);
 
 		/* Check if the we got some results */
-		if (!self->cachedaddr)
-			return -EAGAIN;		/* Didn't find any devices */
+		if (!self->cachedaddr) {
+			err = -EAGAIN;		/* Didn't find any devices */
+			goto out;
+		}
 		daddr = self->cachedaddr;
 		/* Cleanup */
 		self->cachedaddr = 0;