History

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-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. ====================

David S. Miller committed 5 years ago

Commit fe508932 parents a550409 5d8dbb76 files · +122 −9Browse files

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

Unified · Split

include/uapi/linux/xfrm.h+11−0
@@ -213,6 +213,11 @@ enum { · 212 unmodified lines
213 XFRM_MSG_GETSPDINFO,213 XFRM_MSG_GETSPDINFO,
214#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO214#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 XFRM_MSG_MAPPING,221 XFRM_MSG_MAPPING,
217#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING222#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
218 __XFRM_MSG_MAX223 __XFRM_MSG_MAX
@@ -508,6 +513,12 @@ struct xfrm_user_offload { · 289 unmodified lines
508#define XFRM_OFFLOAD_IPV6 1513#define XFRM_OFFLOAD_IPV6 1
509#define XFRM_OFFLOAD_INBOUND 2514#define XFRM_OFFLOAD_INBOUND 2
510 515
516struct xfrm_userpolicy_default {
517#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)
518 __u8 dirmask;
519 __u8 action;
520};
521
511#ifndef __KERNEL__522#ifndef __KERNEL__
512/* backwards compatibility for userspace */523/* backwards compatibility for userspace */
513#define XFRMGRP_ACQUIRE 1524#define XFRMGRP_ACQUIRE 1