Commit 06f1ecd4 authored Nov 01, 2021 by David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2021-10-30

Just two minor changes this time:

1) Remove some superfluous header files from xfrm4_tunnel.c
   From Mianhan Liu.

2) Simplify some error checks in xfrm_input().
   From luo penghao.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 894d0844 ad57dae8

net/ipv4/xfrm4_tunnel.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -8,9 +8,7 @@

		#include <linux/skbuff.h>
		#include <linux/module.h>
		#include <linux/mutex.h>
		#include <net/xfrm.h>
		#include <net/ip.h>
		#include <net/protocol.h>

		static int ipip_output(struct xfrm_state x, struct sk_buff skb)

net/xfrm/xfrm_input.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -530,7 +530,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
		goto drop;
		}

		if ((err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0) {
		if (xfrm_parse_spi(skb, nexthdr, &spi, &seq)) {
		XFRM_INC_STATS(net, LINUX_MIB_XFRMINHDRERROR);
		goto drop;
		}
		@@ -560,7 +560,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
		}

		seq = 0;
		if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0) {
		if (!spi && xfrm_parse_spi(skb, nexthdr, &spi, &seq)) {
		secpath_reset(skb);
		XFRM_INC_STATS(net, LINUX_MIB_XFRMINHDRERROR);
		goto drop;