From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00BDAC43381 for ; Mon, 25 Feb 2019 21:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C264D20842 for ; Mon, 25 Feb 2019 21:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551131753; bh=8WkG1BGK6uDjyfeU2CdlWuB5w8w1/yOc+6QNzmjgAY4=; h=From:To:Cc:Subject:Date:List-ID:From; b=dzUZhtzWFRW75d3GgZXcQH9MtTFX7hOO2B7nbwzGGBQOOsrZUwJw4EjR3X2BTHVYp ZTzj+lD1A2z1ptjOVL9xmBdFcFhZvZHEY851xOum/KxM1dBlXDSktcxMG3Vl+uAZh4 veDlHc+K2LtEMRQtymPcPwDXeoazxdlWHQWBaJzk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730704AbfBYVzw (ORCPT ); Mon, 25 Feb 2019 16:55:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:53574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729497AbfBYVzu (ORCPT ); Mon, 25 Feb 2019 16:55:50 -0500 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 05F162083D; Mon, 25 Feb 2019 21:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551131750; bh=8WkG1BGK6uDjyfeU2CdlWuB5w8w1/yOc+6QNzmjgAY4=; h=From:To:Cc:Subject:Date:From; b=KYYAnp6YpWBr5RDhx2h8RRSmouPPabwKrTpPWI/2ANujvK/tlaKlPh5oS+phLJEEN B9+pdTjdEN3glLvbsL5yOznHb5RGzyg7SZQNjWT4o2/ItmBHJLZWJcDGS1rdAw8gNg vk8FV80E1NIzNSt6/9t0rY63RQLwxs5pAFKtObhc= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, David Ahern , Edward Cree Subject: [PATCH net] ipv4: Pass original device to ip_rcv_finish_core Date: Mon, 25 Feb 2019 13:55:48 -0800 Message-Id: <20190225215548.17340-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern ip_route_input_rcu expects the original ingress device (e.g., for proper multicast handling). The skb->dev can be changed by l3mdev_ip_rcv, so dev needs to be saved prior to calling it. This was the behavior prior to the listify changes. Fixes: 5fa12739a53d0 ("net: ipv4: listify ip_rcv_finish") Cc: Edward Cree Signed-off-by: David Ahern --- net/ipv4/ip_input.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 51d8efba6de2..1f4737b77067 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -307,11 +307,10 @@ static inline bool ip_rcv_options(struct sk_buff *skb) } static int ip_rcv_finish_core(struct net *net, struct sock *sk, - struct sk_buff *skb) + struct sk_buff *skb, struct net_device *dev) { const struct iphdr *iph = ip_hdr(skb); int (*edemux)(struct sk_buff *skb); - struct net_device *dev = skb->dev; struct rtable *rt; int err; @@ -400,6 +399,7 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk, static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { + struct net_device *dev = skb->dev; int ret; /* if ingress device is enslaved to an L3 master device pass the @@ -409,7 +409,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) if (!skb) return NET_RX_SUCCESS; - ret = ip_rcv_finish_core(net, sk, skb); + ret = ip_rcv_finish_core(net, sk, skb, dev); if (ret != NET_RX_DROP) ret = dst_input(skb); return ret; @@ -545,6 +545,7 @@ static void ip_list_rcv_finish(struct net *net, struct sock *sk, INIT_LIST_HEAD(&sublist); list_for_each_entry_safe(skb, next, head, list) { + struct net_device *dev = skb->dev; struct dst_entry *dst; skb_list_del_init(skb); @@ -554,7 +555,7 @@ static void ip_list_rcv_finish(struct net *net, struct sock *sk, skb = l3mdev_ip_rcv(skb); if (!skb) continue; - if (ip_rcv_finish_core(net, sk, skb) == NET_RX_DROP) + if (ip_rcv_finish_core(net, sk, skb, dev) == NET_RX_DROP) continue; dst = skb_dst(skb); -- 2.11.0