diff options
| author | Kees Cook <keescook@chromium.org> | 2013-03-20 05:19:24 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 10:04:34 -0700 |
| commit | afc309756f7bf90739eb24f04ce302ea70a69645 (patch) | |
| tree | 3e2cc986b43b34cced6dd0f9a0d99a0b86cb8d0a | |
| parent | 75e4839c59268b4880b82fa9584980478ef8ca29 (diff) | |
| download | linux-3.10-afc309756f7bf90739eb24f04ce302ea70a69645.tar.gz linux-3.10-afc309756f7bf90739eb24f04ce302ea70a69645.tar.bz2 linux-3.10-afc309756f7bf90739eb24f04ce302ea70a69645.zip | |
net/irda: add missing error path release_sock call
commit 896ee0eee6261e30c3623be931c3f621428947df upstream.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/irda/af_irda.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index bb14c347768..d6c291c45e7 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2584,8 +2584,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; |