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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 C67AEC06513 for ; Tue, 2 Jul 2019 08:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 928AD21479 for ; Tue, 2 Jul 2019 08:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054624; bh=1uRx9QfwF56m2fJlnjnP18x9+UjrU99iyGMwDb+Yvtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oW3hhhUShh8XZeSz1sHBfwbwvmAyrAK9xIzrKyi+K8jGX4foj4dWzRz3lzabGJiNT yJL0mivrYCDwsQAQx7mRlNDDq4xdbaqCgQ3+iOcht3oGpDNeixqd0OzFO1FMO2QHAw tu9eXOc1oGYmeWyuUV4baoCoKkPmkTufzsZr/XuE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727502AbfGBIDn (ORCPT ); Tue, 2 Jul 2019 04:03:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:48852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727498AbfGBIDn (ORCPT ); Tue, 2 Jul 2019 04:03:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C27021851; Tue, 2 Jul 2019 08:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054623; bh=1uRx9QfwF56m2fJlnjnP18x9+UjrU99iyGMwDb+Yvtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=saP7hTLzW1m3awwb0R4OWoksDsdBLxO770QDfHzsXCtAer0YMfToEPBxYrAUpXL3E Wi8ihDTJXJbLnrnOO/Z2VDmGhdcD38qcD1MILqC3DDO/jl11n+s5/6ZyiAjM1Obi+Q Lw3jr1Ml0GNDtXjQqTqDw0F4azAInGS+cLe5EeKA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Suryaputra , David Ahern , "David S. Miller" Subject: [PATCH 5.1 32/55] ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop Date: Tue, 2 Jul 2019 10:01:40 +0200 Message-Id: <20190702080125.799964799@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080124.103022729@linuxfoundation.org> References: <20190702080124.103022729@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Suryaputra [ Upstream commit 38c73529de13e1e10914de7030b659a2f8b01c3b ] In commit 19e4e768064a8 ("ipv4: Fix raw socket lookup for local traffic"), the dif argument to __raw_v4_lookup() is coming from the returned value of inet_iif() but the change was done only for the first lookup. Subsequent lookups in the while loop still use skb->dev->ifIndex. Fixes: 19e4e768064a8 ("ipv4: Fix raw socket lookup for local traffic") Signed-off-by: Stephen Suryaputra Reviewed-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -201,7 +201,7 @@ static int raw_v4_input(struct sk_buff * } sk = __raw_v4_lookup(net, sk_next(sk), iph->protocol, iph->saddr, iph->daddr, - skb->dev->ifindex, sdif); + dif, sdif); } out: read_unlock(&raw_v4_hashinfo.lock);