| Message ID | 20240502084838.2269355-1-steffen.klassert@secunet.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 2024-05-02 at 10:48 +0200, Steffen Klassert wrote: > 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. > > Please pull or let me know if there are problems. This landed in my inbox after I almost finalized today's net PR, so these fixes will not enter it, they will reach Liuns' tree next week. I hope it's not a big deal. Cheers, Paolo
On Thu, May 02, 2024 at 12:53:43PM +0200, Paolo Abeni wrote: > On Thu, 2024-05-02 at 10:48 +0200, Steffen Klassert wrote: > > 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. > > > > Please pull or let me know if there are problems. > > This landed in my inbox after I almost finalized today's net PR, so > these fixes will not enter it, they will reach Liuns' tree next week. > > I hope it's not a big deal. I'm OK with that. Thanks!
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. Please pull or let me know if there are problems. Thanks! The following changes since commit bccb798e07f8bb8b91212fe8ed1e421685449076: octeontx2-pf: Fix transmit scheduler resource leak (2024-04-07 15:45:56 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git tags/ipsec-2024-05-02 for you to fetch changes up to b6d2e438e16c7d4dbde08cfb2b95b0f3f325ba40: xfrm: Correct spelling mistake in xfrm.h comment (2024-04-29 07:52:40 +0200) ---------------------------------------------------------------- ipsec-2024-05-02 ---------------------------------------------------------------- Antony Antony (2): xfrm: fix possible derferencing in error path xfrm: Correct spelling mistake in xfrm.h comment Paul Davey (1): xfrm: Preserve vlan tags for transport mode software GRO include/linux/skbuff.h | 15 +++++++++++++++ include/net/xfrm.h | 3 +++ include/uapi/linux/xfrm.h | 2 +- net/ipv4/xfrm4_input.c | 6 +++++- net/ipv6/xfrm6_input.c | 6 +++++- net/xfrm/xfrm_input.c | 8 ++++++++ net/xfrm/xfrm_policy.c | 2 ++ 7 files changed, 39 insertions(+), 3 deletions(-)