Merge tag 'ipsec-2024-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/klasser...
authorJakub Kicinski <kuba@kernel.org>
Fri, 3 May 2024 22:56:15 +0000 (15:56 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 3 May 2024 22:56:15 +0000 (15:56 -0700)
commitd0de61673908765f4e189fe26f4de6e87caf00e5
tree4ffd1bfc4ede6ab658d65e0420fc855ae052fb29
parentf2d859045ec148ba12d26637c1ea50f16828916f
parentb6d2e438e16c7d4dbde08cfb2b95b0f3f325ba40
Merge tag 'ipsec-2024-05-02' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2024-05-02

1) Fix an error pointer dereference in xfrm_in_fwd_icmp.
   From Antony Antony.

2) Preserve vlan tags for ESP transport mode software GRO.
   From Paul Davey.

3) Fix a spelling mistake in an uapi xfrm.h comment.
   From Anotny Antony.

* tag 'ipsec-2024-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec:
  xfrm: Correct spelling mistake in xfrm.h comment
  xfrm: Preserve vlan tags for transport mode software GRO
  xfrm: fix possible derferencing in error path
====================

Link: https://lore.kernel.org/r/20240502084838.2269355-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>