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=-6.8 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 73495C606BD for ; Mon, 8 Jul 2019 15:16:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFD0216FD for ; Mon, 8 Jul 2019 15:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599002; bh=RkmNZ60RHuqQMo2yshWpoMstTZ1TFdSZxz3kMY9ODOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZTvgb6cqZ5RCuRuNDk35+S97uBGA+BcZ7deg2DNS0l69OSzmMlrAfpmK0yAttwvn7 5eHiRm/gQkK9AyYMPw+EWNgdXtJs8oy2T9g+Zg0RApNfP93x98GkaVZqscqzJK18Em BBC3l7g5ujbWOSZBKg1wd2e84bUrkkpvMVqWSYBc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732627AbfGHPQl (ORCPT ); Mon, 8 Jul 2019 11:16:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:39702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732615AbfGHPQh (ORCPT ); Mon, 8 Jul 2019 11:16:37 -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 93CA72166E; Mon, 8 Jul 2019 15:16:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562598997; bh=RkmNZ60RHuqQMo2yshWpoMstTZ1TFdSZxz3kMY9ODOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=psuBfJSSRIahcm4AFDDUwbia860GD3jIh4b3/wrq7LxUb6+qrbQCQlFGl+54m8DwQ xAufZgl5bK4PgRwtlqE8EfDMUEnETDeqfQS6buGdhDNIXI0+owP9wpjfuA1MO3J8Qq yX6q5bDwBPCNZePTuz+dq6ccQa1fOHl4ZW17OIEY= 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 4.4 44/73] ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop Date: Mon, 8 Jul 2019 17:12:54 +0200 Message-Id: <20190708150523.713771801@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150513.136580595@linuxfoundation.org> References: <20190708150513.136580595@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -195,7 +195,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); + dif); } out: read_unlock(&raw_v4_hashinfo.lock);