Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2021-08-27 1) Remove an unneeded extra variable in esp4 esp_ssg_unref. From Corey Minyard. 2) Add a configuration option to change the default behaviour to block traffic if there is no matching policy. Joint work with Christian Langrock and Antony Antony. 3) Fix a shift-out-of-bounce bug reported from syzbot. From Pavel Skripkin. Please pull or let me know if there are problems. ====================
Showing the changes to include/uapi (1 of 6 files). Show all
Unified · Split
| @@ -213,6 +213,11 @@ enum { · 212 unmodified lines | ||
| 213 | 213 | XFRM_MSG_GETSPDINFO, |
| 214 | 214 | #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO |
| 215 | 215 | |
| 216 | + XFRM_MSG_SETDEFAULT, | |
| 217 | +#define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT | |
| 218 | + XFRM_MSG_GETDEFAULT, | |
| 219 | +#define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT | |
| 220 | + | |
| 216 | 221 | XFRM_MSG_MAPPING, |
| 217 | 222 | #define XFRM_MSG_MAPPING XFRM_MSG_MAPPING |
| 218 | 223 | __XFRM_MSG_MAX |
| @@ -508,6 +513,12 @@ struct xfrm_user_offload { · 289 unmodified lines | ||
| 508 | 513 | #define XFRM_OFFLOAD_IPV6 1 |
| 509 | 514 | #define XFRM_OFFLOAD_INBOUND 2 |
| 510 | 515 | |
| 516 | +struct xfrm_userpolicy_default { | |
| 517 | +#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8) | |
| 518 | + __u8 dirmask; | |
| 519 | + __u8 action; | |
| 520 | +}; | |
| 521 | + | |
| 511 | 522 | #ifndef __KERNEL__ |
| 512 | 523 | /* backwards compatibility for userspace */ |
| 513 | 524 | #define XFRMGRP_ACQUIRE 1 |