ax25: Fix possible oops in ax25_make_new

Gitweb:     http://git.kernel.org/linus/8c185ab6185bf5e67766edb000ce428269364c86
Commit:     8c185ab6185bf5e67766edb000ce428269364c86
Parent:     81bbb3d4048cf577b5babcb0834230de391a35c5
Author:     Jarek Poplawski <jarkao2 <at> gmail.com>
AuthorDate: Sun Sep 27 10:57:02 2009 +0000
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:44:12 2009 -0700

    ax25: Fix possible oops in ax25_make_new

    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 <at> free.fr>

    Signed-off-by: Jarek Poplawski <jarkao2 <at> gmail.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 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 cd1c3dc..f454607 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
 <at>  <at>  -901,7 +901,6  <at>  <at>  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;
 <at>  <at>  -939,6 +938,7  <at>  <at>  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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html