netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarek Poplawski <jarkao2@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: "Bernard, f6bvp" <f6bvp@free.fr>,
	Linux Netdev List <netdev@vger.kernel.org>,
	Ralf Baechle DL5RB <ralf@linux-mips.org>
Subject: [PATCH] netrom: Fix sock_orphan() use in nr_release
Date: Mon, 6 Oct 2008 00:16:48 +0200	[thread overview]
Message-ID: <20081005221648.GB2613@ami.dom.local> (raw)
In-Reply-To: <1223241500.18094.32.camel@f6bvp-5>

netrom: Fix sock_orphan() use in nr_release

While debugging another bug it was found that NetRom socks
are sometimes seen unorphaned in sk_free(). This patch moves
sock_orphan() in nr_release() to the beginning (like in ax25,
or rose).

Reported-and-tested-by: Bernard Pidoux f6bvp <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>

---

 net/netrom/af_netrom.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 532e4fa..9f1ea4a 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -525,6 +525,7 @@ static int nr_release(struct socket *sock)
 	if (sk == NULL) return 0;
 
 	sock_hold(sk);
+	sock_orphan(sk);
 	lock_sock(sk);
 	nr = nr_sk(sk);
 
@@ -548,7 +549,6 @@ static int nr_release(struct socket *sock)
 		sk->sk_state    = TCP_CLOSE;
 		sk->sk_shutdown |= SEND_SHUTDOWN;
 		sk->sk_state_change(sk);
-		sock_orphan(sk);
 		sock_set_flag(sk, SOCK_DESTROY);
 		break;
 

  parent reply	other threads:[~2008-10-05 22:15 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-28 12:49 kernel panic linux-2.6.27-rc7 Bernard Pidoux F6BVP
2008-09-29 12:30 ` ax25 rose " Jarek Poplawski
2008-09-30  9:40   ` Bernard Pidoux F6BVP
2008-09-30 10:10     ` Jarek Poplawski
2008-09-30 11:17       ` Jarek Poplawski
2008-09-30 20:59         ` Bernard Pidoux F6BVP
2008-09-30 21:30           ` Jarek Poplawski
2008-09-30 22:49             ` Bernard Pidoux F6BVP
2008-10-01  5:58               ` Jarek Poplawski
2008-10-02 18:20                 ` Bernard, f6bvp
2008-10-02 19:48                   ` Jarek Poplawski
2008-10-03  7:34                     ` Jarek Poplawski
2008-10-03  7:43                       ` Jarek Poplawski
2008-10-04 18:30                         ` Bernard, f6bvp
2008-10-04 19:11                           ` Jarek Poplawski
2008-10-04 20:09                             ` Jarek Poplawski
2008-10-05 15:40                               ` Bernard, f6bvp
2008-10-05 20:33                                 ` Jarek Poplawski
2008-10-05 21:09                                   ` Jarek Poplawski
2008-10-05 18:31                               ` Bernard, f6bvp
2008-10-05 20:40                                 ` Jarek Poplawski
2008-10-05 21:18                                   ` Bernard, f6bvp
2008-10-05 22:05                                     ` [PATCH to REVERT] " Jarek Poplawski
2008-10-06 20:05                                       ` David Miller
2008-10-05 22:16                                     ` Jarek Poplawski [this message]
2008-10-05 13:04                           ` Jarek Poplawski
2008-10-01  6:58       ` [PATCH] lib8390: Fix locking in ei_poll (poll controller) Jarek Poplawski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081005221648.GB2613@ami.dom.local \
    --to=jarkao2@gmail.com \
    --cc=davem@davemloft.net \
    --cc=f6bvp@free.fr \
    --cc=netdev@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).