History

Merge tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Pull more networking updates from Jakub Kicinski: - Support GRO decapsulation for IPsec ESP in UDP - Add a handful of MODULE_DESCRIPTION()s - Drop questionable alignment check in TCP AO to avoid build issue after changes in the crypto tree * tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: net: tcp: remove call to obsolete crypto_ahash_alignmask() net: fill in MODULE_DESCRIPTION()s under drivers/net/ net: fill in MODULE_DESCRIPTION()s under net/802* net: fill in MODULE_DESCRIPTION()s under net/core net: fill in MODULE_DESCRIPTION()s in kuba@'s modules xfrm: policy: fix layer 4 flowi decoding xfrm Fix use after free in __xfrm6_udp_encap_rcv. xfrm: policy: replace session decode with flow dissector xfrm: move mark and oif flowi decode into common code xfrm: pass struct net to xfrm_decode_session wrappers xfrm: Support GRO for IPv6 ESP in UDP encapsulation xfrm: Support GRO for IPv4 ESP in UDP encapsulation xfrm: Use the XFRM_GRO to indicate a GRO call on input xfrm: Annotate struct xfrm_sec_ctx with __counted_by xfrm: Remove unused function declarations

Linus Torvalds committed 3 years ago

Commit ff269e22 parents 05bf73a f2fbb9039 files · +361 −247Browse files

Showing the changes to include/uapi/linux (1 of 39 files). Show all

Unified · Split

include/uapi/linux/xfrm.h+2−1
@@ -4,6 +4,7 @@ · 3 unmodified lines
4 4
5#include <linux/in6.h>5#include <linux/in6.h>
6#include <linux/types.h>6#include <linux/types.h>
7#include <linux/stddef.h>
7 8
8/* All of the structures in this file may not change size as they are9/* All of the structures in this file may not change size as they are
9 * passed into the kernel from userspace via netlink sockets.10 * passed into the kernel from userspace via netlink sockets.
@@ -33,7 +34,7 @@ struct xfrm_sec_ctx { · 23 unmodified lines
33 __u8 ctx_alg;34 __u8 ctx_alg;
34 __u16 ctx_len;35 __u16 ctx_len;
35 __u32 ctx_sid;36 __u32 ctx_sid;
36 char ctx_str[];37 char ctx_str[] __counted_by(ctx_len);
37};38};
38 39
39/* Security Context Domains of Interpretation */40/* Security Context Domains of Interpretation */