* [patch net-next 1/2] [PATCH] net: ip, raw_diag -- Fix socket leaking for destroy request
@ 2016-11-02 12:36 Cyrill Gorcunov
2016-11-02 14:56 ` David Ahern
0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2016-11-02 12:36 UTC (permalink / raw)
To: netdev
Cc: Eric Dumazet, David S. Miller, David Ahern, Andrey Vagin,
Stephen Hemminger, Cyrill Gorcunov
[-- Attachment #1: inet-diag-raw-add-sock_put --]
[-- Type: text/plain, Size: 986 bytes --]
In raw_diag_destroy the helper raw_sock_get returns
with sock_hold call, so we have to put it then.
CC: David S. Miller <davem@davemloft.net>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: David Ahern <dsa@cumulusnetworks.com>
CC: Andrey Vagin <avagin@openvz.org>
CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
net/ipv4/raw_diag.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: linux-ml.git/net/ipv4/raw_diag.c
===================================================================
--- linux-ml.git.orig/net/ipv4/raw_diag.c
+++ linux-ml.git/net/ipv4/raw_diag.c
@@ -205,11 +205,14 @@ static int raw_diag_destroy(struct sk_bu
{
struct net *net = sock_net(in_skb->sk);
struct sock *sk;
+ int err;
sk = raw_sock_get(net, r);
if (IS_ERR(sk))
return PTR_ERR(sk);
- return sock_diag_destroy(sk, ECONNABORTED);
+ err = sock_diag_destroy(sk, ECONNABORTED);
+ sock_put(sk);
+ return err;
}
#endif
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch net-next 1/2] [PATCH] net: ip, raw_diag -- Fix socket leaking for destroy request
2016-11-02 12:36 [patch net-next 1/2] [PATCH] net: ip, raw_diag -- Fix socket leaking for destroy request Cyrill Gorcunov
@ 2016-11-02 14:56 ` David Ahern
0 siblings, 0 replies; 2+ messages in thread
From: David Ahern @ 2016-11-02 14:56 UTC (permalink / raw)
To: Cyrill Gorcunov, netdev
Cc: Eric Dumazet, David S. Miller, Andrey Vagin, Stephen Hemminger
On 11/2/16 6:36 AM, Cyrill Gorcunov wrote:
> In raw_diag_destroy the helper raw_sock_get returns
> with sock_hold call, so we have to put it then.
>
> CC: David S. Miller <davem@davemloft.net>
> CC: Eric Dumazet <eric.dumazet@gmail.com>
> CC: David Ahern <dsa@cumulusnetworks.com>
> CC: Andrey Vagin <avagin@openvz.org>
> CC: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
> ---
> net/ipv4/raw_diag.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Acked-by: David Ahern <dsa@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-02 14:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-02 12:36 [patch net-next 1/2] [PATCH] net: ip, raw_diag -- Fix socket leaking for destroy request Cyrill Gorcunov
2016-11-02 14:56 ` David Ahern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).