From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benedict Wong Subject: [PATCH v2 ipsec] Clear secpath on loopback_xmit Date: Mon, 8 Oct 2018 11:13:36 -0700 Message-ID: <20181008181335.178295-1-benedictwong@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: nharold@google.com, benedictwong@google.com, lorenzo@google.com To: netdev@vger.kernel.org Return-path: Received: from mail-pf1-f202.google.com ([209.85.210.202]:34484 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726348AbeJIB0u (ORCPT ); Mon, 8 Oct 2018 21:26:50 -0400 Received: by mail-pf1-f202.google.com with SMTP id i81-v6so17557777pfj.1 for ; Mon, 08 Oct 2018 11:13:54 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: This patch clears the skb->sp when transmitted over loopback. This ensures that the loopback-ed packet does not have any secpath information from the outbound transforms. At present, this causes XFRM tunnel mode packets to be dropped with XFRMINNOPOLS, due to the outbound state being in the secpath, without a matching inbound policy. Clearing the secpath ensures that all states added to the secpath are exclusively from the inbound processing. Tests: xfrm tunnel mode tests added for loopback: https://android-review.googlesource.com/c/kernel/tests/+/777328 Fixes: 8fe7ee2ba983 ("[IPsec]: Strengthen policy checks") Signed-off-by: Benedict Wong --- drivers/net/loopback.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 30612497643c..a6bf54df94bd 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -50,6 +50,7 @@ #include #include #include +#include #include /* For the statistics structure. */ #include /* For ARPHRD_ETHER */ #include @@ -82,6 +83,9 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, */ skb_dst_force(skb); + // Clear secpath to ensure xfrm policy check not tainted by outbound SAs. + secpath_reset(skb); + skb->protocol = eth_type_trans(skb, dev); /* it's OK to use per_cpu_ptr() because BHs are off */ -- 2.19.0.605.g01d371f741-goog