From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59988 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596AbcDPQfG (ORCPT ); Sat, 16 Apr 2016 12:35:06 -0400 Subject: Patch "ipv6: l2tp: fix a potential issue in l2tp_ip6_recv" has been added to the 4.5-stable tree To: yanhaishuang@cmss.chinamobile.com, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 16 Apr 2016 09:35:05 -0700 Message-ID: <14608245053781@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ipv6: l2tp: fix a potential issue in l2tp_ip6_recv to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ipv6-l2tp-fix-a-potential-issue-in-l2tp_ip6_recv.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Sat Apr 16 09:15:18 PDT 2016 From: Haishuang Yan Date: Sun, 3 Apr 2016 22:09:24 +0800 Subject: ipv6: l2tp: fix a potential issue in l2tp_ip6_recv From: Haishuang Yan [ Upstream commit be447f305494e019dfc37ea4cdf3b0e4200b4eba ] pskb_may_pull() can change skb->data, so we have to load ptr/optr at the right place. Signed-off-by: Haishuang Yan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/l2tp/l2tp_ip6.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -135,12 +135,11 @@ static int l2tp_ip6_recv(struct sk_buff struct l2tp_tunnel *tunnel = NULL; int length; - /* Point to L2TP header */ - optr = ptr = skb->data; - if (!pskb_may_pull(skb, 4)) goto discard; + /* Point to L2TP header */ + optr = ptr = skb->data; session_id = ntohl(*((__be32 *) ptr)); ptr += 4; @@ -168,6 +167,9 @@ static int l2tp_ip6_recv(struct sk_buff if (!pskb_may_pull(skb, length)) goto discard; + /* Point to L2TP header */ + optr = ptr = skb->data; + ptr += 4; pr_debug("%s: ip recv\n", tunnel->name); print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length); } Patches currently in stable-queue which might be from yanhaishuang@cmss.chinamobile.com are queue-4.5/bridge-allow-set-bridge-ageing-time-when-switchdev-disabled.patch queue-4.5/ipv4-l2tp-fix-a-potential-issue-in-l2tp_ip_recv.patch queue-4.5/ipv6-l2tp-fix-a-potential-issue-in-l2tp_ip6_recv.patch