From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39820 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1166293AbdD2GYl (ORCPT ); Sat, 29 Apr 2017 02:24:41 -0400 Subject: Patch "net: neigh: guard against NULL solicit() method" has been added to the 4.10-stable tree To: edumazet@google.com, davem@davemloft.net, dvyukov@google.com, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 29 Apr 2017 08:23:24 +0200 Message-ID: <1493447004131232@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 net: neigh: guard against NULL solicit() method to the 4.10-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: net-neigh-guard-against-null-solicit-method.patch and it can be found in the queue-4.10 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 29 08:22:40 CEST 2017 From: Eric Dumazet Date: Thu, 23 Mar 2017 12:39:21 -0700 Subject: net: neigh: guard against NULL solicit() method From: Eric Dumazet [ Upstream commit 48481c8fa16410ffa45939b13b6c53c2ca609e5f ] Dmitry posted a nice reproducer of a bug triggering in neigh_probe() when dereferencing a NULL neigh->ops->solicit method. This can happen for arp_direct_ops/ndisc_direct_ops and similar, which can be used for NUD_NOARP neighbours (created when dev->header_ops is NULL). Admin can then force changing nud_state to some other state that would fire neigh timer. Signed-off-by: Eric Dumazet Reported-by: Dmitry Vyukov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/neighbour.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -860,7 +860,8 @@ static void neigh_probe(struct neighbour if (skb) skb = skb_clone(skb, GFP_ATOMIC); write_unlock(&neigh->lock); - neigh->ops->solicit(neigh, skb); + if (neigh->ops->solicit) + neigh->ops->solicit(neigh, skb); atomic_inc(&neigh->probes); kfree_skb(skb); } Patches currently in stable-queue which might be from edumazet@google.com are queue-4.10/ping-implement-proper-locking.patch queue-4.10/tcp-mark-skbs-with-scm_timestamping_opt_stats.patch queue-4.10/tcp-clear-saved_syn-in-tcp_disconnect.patch queue-4.10/net-ipv6-regenerate-host-route-if-moved-to-gc-list.patch queue-4.10/secure_seq-downgrade-to-per-host-timestamp-offsets.patch queue-4.10/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch queue-4.10/net-packet-fix-overflow-in-check-for-tp_reserve.patch queue-4.10/net-neigh-guard-against-null-solicit-method.patch queue-4.10/tcp-fix-scm_timestamping_opt_stats-for-normal-skbs.patch queue-4.10/tcp-memset-ca_priv-data-to-0-properly.patch