Re: [PATCH] net/irda: add missing error path release_sock call

2013-03-20 Thread David Miller
From: Kees Cook 
Date: Wed, 20 Mar 2013 08:19:24 -0700

> This makes sure that release_sock is called for all error conditions in
> irda_getsockopt.
> 
> Signed-off-by: Kees Cook 
> Reported-by: Brad Spengler 

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] net/irda: add missing error path release_sock call

2013-03-20 Thread Kees Cook
This makes sure that release_sock is called for all error conditions in
irda_getsockopt.

Signed-off-by: Kees Cook 
Reported-by: Brad Spengler 
Cc: sta...@vger.kernel.org
---
 net/irda/af_irda.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

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 @@ bed:
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;
-- 
1.7.9.5


-- 
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] net/irda: add missing error path release_sock call

2013-03-20 Thread Kees Cook
This makes sure that release_sock is called for all error conditions in
irda_getsockopt.

Signed-off-by: Kees Cook keesc...@chromium.org
Reported-by: Brad Spengler spen...@grsecurity.net
Cc: sta...@vger.kernel.org
---
 net/irda/af_irda.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

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 @@ bed:
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;
-- 
1.7.9.5


-- 
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net/irda: add missing error path release_sock call

2013-03-20 Thread David Miller
From: Kees Cook keesc...@chromium.org
Date: Wed, 20 Mar 2013 08:19:24 -0700

 This makes sure that release_sock is called for all error conditions in
 irda_getsockopt.
 
 Signed-off-by: Kees Cook keesc...@chromium.org
 Reported-by: Brad Spengler spen...@grsecurity.net

Applied, thanks.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/