From: Jarek Poplawski <jarkao2@gmail.com>
To: Ralf Baechle DL5RB <ralf@linux-mips.org>
Cc: David Miller <davem@davemloft.net>,
Bernard Pidoux F6BVP <f6bvp@free.fr>,
Bernard Pidoux <bernard.pidoux@upmc.fr>,
Linux Netdev List <netdev@vger.kernel.org>,
linux-hams <linux-hams@vger.kernel.org>
Subject: [PATCH] ax25: Fix possible oops in ax25_make_new
Date: Sun, 27 Sep 2009 22:57:02 +0200 [thread overview]
Message-ID: <20090927205701.GA7205@del.dom.local> (raw)
In-Reply-To: <20090925134052.GA1661@linux-mips.org>
In ax25_make_new, if kmemdup of digipeat returns an error, there would
be an oops in sk_free while calling sk_destruct, because sk_protinfo
is NULL at the moment; move sk->sk_destruct initialization after this.
BTW of reported-by: Bernard Pidoux F6BVP <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
net/ax25/af_ax25.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index fbcac76..9884639 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -900,7 +900,6 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)
sock_init_data(NULL, sk);
- sk->sk_destruct = ax25_free_sock;
sk->sk_type = osk->sk_type;
sk->sk_priority = osk->sk_priority;
sk->sk_protocol = osk->sk_protocol;
@@ -938,6 +937,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)
}
sk->sk_protinfo = ax25;
+ sk->sk_destruct = ax25_free_sock;
ax25->sk = sk;
return sk;
next prev parent reply other threads:[~2009-09-27 20:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-21 20:11 [AX25] kernel panic Jarek Poplawski
2009-09-23 21:17 ` Bernard Pidoux F6BVP
2009-09-24 8:07 ` Jarek Poplawski
2009-09-25 13:10 ` [PATCH] ax25: Fix ax25_cb refcounting in ax25_ctl_ioctl Jarek Poplawski
2009-09-25 13:40 ` Ralf Baechle DL5RB
2009-09-25 18:35 ` Jarek Poplawski
2009-09-25 19:10 ` David Miller
2009-09-25 19:50 ` Bernard Pidoux
2009-09-25 20:29 ` Jarek Poplawski
2009-09-27 7:23 ` Ralf Baechle DL5RB
2009-09-27 17:10 ` Jarek Poplawski
2009-09-27 19:02 ` Jarek Poplawski
2009-09-27 20:57 ` Jarek Poplawski [this message]
2009-09-28 10:47 ` [PATCH] ax25: Fix possible oops in ax25_make_new Bernard Pidoux F6BVP
2009-09-30 23:44 ` David Miller
2009-09-28 7:12 ` [PATCH] ax25: Add missing dev_put in ax25_setsockopt Jarek Poplawski
2009-09-28 10:48 ` Bernard Pidoux F6BVP
2009-09-28 12:53 ` Ralf Baechle
2009-09-28 17:46 ` Bernard Pidoux
2009-09-28 19:26 ` David Miller
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=20090927205701.GA7205@del.dom.local \
--to=jarkao2@gmail.com \
--cc=bernard.pidoux@upmc.fr \
--cc=davem@davemloft.net \
--cc=f6bvp@free.fr \
--cc=linux-hams@vger.kernel.org \
--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).