Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbcL0HyI (ORCPT ); Tue, 27 Dec 2016 02:54:08 -0500 Received: from m12-11.163.com ([220.181.12.11]:39174 "EHLO m12-11.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbcL0HyD (ORCPT ); Tue, 27 Dec 2016 02:54:03 -0500 From: Wei Zhang To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: fix incorrect original ingress device index in PKTINFO Date: Tue, 27 Dec 2016 15:52:18 +0800 Message-Id: <1482825138-2125-1-git-send-email-asuka.com@163.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: C8CowAAXN+fEHWJYyarPGg--.47871S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tFyftr18WrWDAFWDXF43ZFb_yoW8Wr48p3 W3GrW8WrWkJry3Can5A3WIq343Ww4rJas8uFs8Z3yrZ3s8Ca4Fqw15tFWa9F42yr4fAay5 JFZ3Kr15Z3WDCFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07brT5LUUUUU= X-Originating-IP: [221.237.152.67] X-CM-SenderInfo: 5dvxytoofrzqqrwthudrp/1tbiFQxN1lWBZM5kngAAsG Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1584 Lines: 36 When we send a packet for our own local address on a non-loopback interface (e.g. eth0), due to the change had been introduced from commit 0b922b7a829c ("net: original ingress device index in PKTINFO"), the original ingress device index would be set as the loopback interface. However, the packet should be considered as if it is being arrived via the sending interface (eth0), otherwise it would break the expectation of the userspace application (e.g. the DHCPRELEASE message from dhcp_release binary would be ignored by the dnsmasq daemon) Signed-off-by: Wei Zhang --- net/ipv4/ip_sockglue.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index b8a2d63..b6a6d35 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1202,8 +1202,13 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb) * which has interface index (iif) as the first member of the * underlying inet{6}_skb_parm struct. This code then overlays * PKTINFO_SKB_CB and in_pktinfo also has iif as the first - * element so the iif is picked up from the prior IPCB + * element so the iif is picked up from the prior IPCB except + * iif is loopback interface which the packet should be + * considered as if it is being arrived via the sending interface */ + if (pktinfo->ipi_ifindex == LOOPBACK_IFINDEX) { + pktinfo->ipi_ifindex = inet_iif(skb); + } pktinfo->ipi_spec_dst.s_addr = fib_compute_spec_dst(skb); } else { pktinfo->ipi_ifindex = 0; -- 1.8.3.1