From: "ordex (Code Review)" Date: Sun, 26 Jan 2025 01:33:38 +0000 In-Reply-To: References: Reply-To: a@...2181..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <447c0709e58cb547280386568e628e1bf3471237-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="mEAkM2KlTaA="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: dco_linux: extend netlink error cb with extra info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --mEAkM2KlTaA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=3Demail to look at the new patch set (#5). Change subject: dco_linux: extend netlink error cb with extra info ...................................................................... dco_linux: extend netlink error cb with extra info A netlink error may contain more specific attributes: i.e. missing attributes or missing neted objects. Parse and print this information too. Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b Signed-off-by: Antonio Quartulli --- M dev-tools/special-files.lst M src/openvpn/Makefile.am M src/openvpn/dco_linux.c A src/openvpn/netlink.h 4 files changed, 396 insertions(+), 0 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/5 diff --git a/dev-tools/special-files.lst b/dev-tools/special-files.lst index e5f2fc2..8702dfc 100644 --- a/dev-tools/special-files.lst +++ b/dev-tools/special-files.lst @@ -3,3 +3,4 @@ E:src/compat/compat-lz4.h # Preserve LZ4 upstream formatting E:src/openvpn/ovpn_dco_linux.h # Preserve ovpn-dco upstream format= ting E:src/openvpn/ovpn_dco_win.h # Preserve ovpn-dco-win upstream fo= rmatting +E:src/openvpn/netlink.h # Preserve netlink.h upstream forma= tting diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index ecb2bcf..7ed27a5 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -79,6 +79,7 @@ mbuf.c mbuf.h \ memdbg.h \ misc.c misc.h \ + netlink.h \ ovpn_dco_freebsd.h \ ovpn_dco_linux.h \ ovpn_dco_win.h \ diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index b038382..881d495 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -29,6 +29,14 @@ #include "syshead.h" +/* include bundled netlink.h as we need a relatively modern version + * defining NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE. + * + * Include it first to make sure that nobody else pulls in the system + * copy. + */ +#include "netlink.h" + #include "dco_linux.h" #include "errlevel.h" #include "buffer.h" @@ -339,6 +347,18 @@ (char *)nla_data(tb_msg[NLMSGERR_ATTR_MSG])); } + if (tb_msg[NLMSGERR_ATTR_MISS_NEST]) + { + msg(M_WARN, "kernel error: missing required nesting type %u\n", + nla_get_u32(tb_msg[NLMSGERR_ATTR_MISS_NEST])); + } + + if (tb_msg[NLMSGERR_ATTR_MISS_TYPE]) + { + msg(M_WARN, "kernel error: missing required attribute type %u\n", + nla_get_u32(tb_msg[NLMSGERR_ATTR_MISS_TYPE])); + } + return NL_STOP; } diff --git a/src/openvpn/netlink.h b/src/openvpn/netlink.h new file mode 100644 index 0000000..47bac97 --- /dev/null +++ b/src/openvpn/netlink.h @@ -0,0 +1,374 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __LINUX_NETLINK_H +#define __LINUX_NETLINK_H + +#include +#include /* for __kernel_sa_family_t */ +#include + +#define NETLINK_ROUTE 0 /* Routing/device hook */ +#define NETLINK_UNUSED 1 /* Unused number */ +#define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ +#define NETLINK_FIREWALL 3 /* Unused number, formerly ip_queue */ +#define NETLINK_SOCK_DIAG 4 /* socket monitoring */ +#define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */ +#define NETLINK_XFRM 6 /* ipsec */ +#define NETLINK_SELINUX 7 /* SELinux event notifications */ +#define NETLINK_ISCSI 8 /* Open-iSCSI */ +#define NETLINK_AUDIT 9 /* auditing */ +#define NETLINK_FIB_LOOKUP 10 +#define NETLINK_CONNECTOR 11 +#define NETLINK_NETFILTER 12 /* netfilter subsystem */ +#define NETLINK_IP6_FW 13 +#define NETLINK_DNRTMSG 14 /* DECnet routing messages (obsolete) */ +#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */ +#define NETLINK_GENERIC 16 +/* leave room for NETLINK_DM (DM Events) */ +#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */ +#define NETLINK_ECRYPTFS 19 +#define NETLINK_RDMA 20 +#define NETLINK_CRYPTO 21 /* Crypto layer */ +#define NETLINK_SMC 22 /* SMC monitoring */ + +#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG + +#define MAX_LINKS 32 + +struct sockaddr_nl { + __kernel_sa_family_t nl_family; /* AF_NETLINK */ + unsigned short nl_pad; /* zero */ + __u32 nl_pid; /* port ID */ + __u32 nl_groups; /* multicast groups mask */ +}; + +/** + * struct nlmsghdr - fixed format metadata header of Netlink messages + * @nlmsg_len: Length of message including header + * @nlmsg_type: Message content type + * @nlmsg_flags: Additional flags + * @nlmsg_seq: Sequence number + * @nlmsg_pid: Sending process port ID + */ +struct nlmsghdr { + __u32 nlmsg_len; + __u16 nlmsg_type; + __u16 nlmsg_flags; + __u32 nlmsg_seq; + __u32 nlmsg_pid; +}; + +/* Flags values */ + +#define NLM_F_REQUEST 0x01 /* It is request message. */ +#define NLM_F_MULTI 0x02 /* Multipart message, terminated by NLMSG_DONE */ +#define NLM_F_ACK 0x04 /* Reply with ack, with zero or error code */ +#define NLM_F_ECHO 0x08 /* Receive resulting notifications */ +#define NLM_F_DUMP_INTR 0x10 /* Dump was inconsistent due to sequence cha= nge */ +#define NLM_F_DUMP_FILTERED 0x20 /* Dump was filtered as requested */ + +/* Modifiers to GET request */ +#define NLM_F_ROOT 0x100 /* specify tree root */ +#define NLM_F_MATCH 0x200 /* return all matching */ +#define NLM_F_ATOMIC 0x400 /* atomic GET */ +#define NLM_F_DUMP (NLM_F_ROOT|NLM_F_MATCH) + +/* Modifiers to NEW request */ +#define NLM_F_REPLACE 0x100 /* Override existing */ +#define NLM_F_EXCL 0x200 /* Do not touch, if it exists */ +#define NLM_F_CREATE 0x400 /* Create, if it does not exist */ +#define NLM_F_APPEND 0x800 /* Add to end of list */ + +/* Modifiers to DELETE request */ +#define NLM_F_NONREC 0x100 /* Do not delete recursively */ +#define NLM_F_BULK 0x200 /* Delete multiple objects */ + +/* Flags for ACK message */ +#define NLM_F_CAPPED 0x100 /* request was capped */ +#define NLM_F_ACK_TLVS 0x200 /* extended ACK TVLs were included */ + +/* + 4.4BSD ADD NLM_F_CREATE|NLM_F_EXCL + 4.4BSD CHANGE NLM_F_REPLACE + + True CHANGE NLM_F_CREATE|NLM_F_REPLACE + Append NLM_F_CREATE + Check NLM_F_EXCL + */ + +#define NLMSG_ALIGNTO 4U +#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) ) +#define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr))) +#define NLMSG_LENGTH(len) ((len) + NLMSG_HDRLEN) +#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len)) +#define NLMSG_DATA(nlh) ((void *)(((char *)nlh) + NLMSG_HDRLEN)) +#define NLMSG_NEXT(nlh,len) ((len) -=3D NLMSG_ALIGN((nlh)->nlmsg_len), \ + (struct nlmsghdr *)(((char *)(nlh)) + \ + NLMSG_ALIGN((nlh)->nlmsg_len))) +#define NLMSG_OK(nlh,len) ((len) >=3D (int)sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len >=3D sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len <=3D (len)) +#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len))) + +#define NLMSG_NOOP 0x1 /* Nothing. */ +#define NLMSG_ERROR 0x2 /* Error */ +#define NLMSG_DONE 0x3 /* End of a dump */ +#define NLMSG_OVERRUN 0x4 /* Data lost */ + +#define NLMSG_MIN_TYPE 0x10 /* < 0x10: reserved control messages */ + +struct nlmsgerr { + int error; + struct nlmsghdr msg; + /* + * followed by the message contents unless NETLINK_CAP_ACK was set + * or the ACK indicates success (error =3D=3D 0) + * message length is aligned with NLMSG_ALIGN() + */ + /* + * followed by TLVs defined in enum nlmsgerr_attrs + * if NETLINK_EXT_ACK was set + */ +}; + +/** + * enum nlmsgerr_attrs - nlmsgerr attributes + * @NLMSGERR_ATTR_UNUSED: unused + * @NLMSGERR_ATTR_MSG: error message string (string) + * @NLMSGERR_ATTR_OFFS: offset of the invalid attribute in the original + * message, counting from the beginning of the header (u32) + * @NLMSGERR_ATTR_COOKIE: arbitrary subsystem specific cookie to + * be used - in the success case - to identify a created + * object or operation or similar (binary) + * @NLMSGERR_ATTR_POLICY: policy for a rejected attribute + * @NLMSGERR_ATTR_MISS_TYPE: type of a missing required attribute, + * %NLMSGERR_ATTR_MISS_NEST will not be present if the attribute was + * missing at the message level + * @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing + * @__NLMSGERR_ATTR_MAX: number of attributes + * @NLMSGERR_ATTR_MAX: highest attribute number + */ +enum nlmsgerr_attrs { + NLMSGERR_ATTR_UNUSED, + NLMSGERR_ATTR_MSG, + NLMSGERR_ATTR_OFFS, + NLMSGERR_ATTR_COOKIE, + NLMSGERR_ATTR_POLICY, + NLMSGERR_ATTR_MISS_TYPE, + NLMSGERR_ATTR_MISS_NEST, + + __NLMSGERR_ATTR_MAX, + NLMSGERR_ATTR_MAX =3D __NLMSGERR_ATTR_MAX - 1 +}; + +#define NETLINK_ADD_MEMBERSHIP 1 +#define NETLINK_DROP_MEMBERSHIP 2 +#define NETLINK_PKTINFO 3 +#define NETLINK_BROADCAST_ERROR 4 +#define NETLINK_NO_ENOBUFS 5 +#define NETLINK_RX_RING 6 +#define NETLINK_TX_RING 7 +#define NETLINK_LISTEN_ALL_NSID 8 +#define NETLINK_LIST_MEMBERSHIPS 9 +#define NETLINK_CAP_ACK 10 +#define NETLINK_EXT_ACK 11 +#define NETLINK_GET_STRICT_CHK 12 + +struct nl_pktinfo { + __u32 group; +}; + +struct nl_mmap_req { + unsigned int nm_block_size; + unsigned int nm_block_nr; + unsigned int nm_frame_size; + unsigned int nm_frame_nr; +}; + +struct nl_mmap_hdr { + unsigned int nm_status; + unsigned int nm_len; + __u32 nm_group; + /* credentials */ + __u32 nm_pid; + __u32 nm_uid; + __u32 nm_gid; +}; + +enum nl_mmap_status { + NL_MMAP_STATUS_UNUSED, + NL_MMAP_STATUS_RESERVED, + NL_MMAP_STATUS_VALID, + NL_MMAP_STATUS_COPY, + NL_MMAP_STATUS_SKIP, +}; + +#define NL_MMAP_MSG_ALIGNMENT NLMSG_ALIGNTO +#define NL_MMAP_MSG_ALIGN(sz) __ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT) +#define NL_MMAP_HDRLEN NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr)) + +#define NET_MAJOR 36 /* Major 36 is reserved for networking */ + +enum { + NETLINK_UNCONNECTED =3D 0, + NETLINK_CONNECTED, +}; + +/* + * <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)--> + * +---------------------+- - -+- - - - - - - - - -+- - -+ + * | Header | Pad | Payload | Pad | + * | (struct nlattr) | ing | | ing | + * +---------------------+- - -+- - - - - - - - - -+- - -+ + * <-------------- nlattr->nla_len --------------> + */ + +struct nlattr { + __u16 nla_len; + __u16 nla_type; +}; + +/* + * nla_type (16 bits) + * +---+---+-------------------------------+ + * | N | O | Attribute Type | + * +---+---+-------------------------------+ + * N :=3D Carries nested attributes + * O :=3D Payload stored in network byte order + * + * Note: The N and O flag are mutually exclusive. + */ +#define NLA_F_NESTED (1 << 15) +#define NLA_F_NET_BYTEORDER (1 << 14) +#define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER) + +#define NLA_ALIGNTO 4 +#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1)) +#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) + +/* Generic 32 bitflags attribute content sent to the kernel. + * + * The value is a bitmap that defines the values being set + * The selector is a bitmask that defines which value is legit + * + * Examples: + * value =3D 0x0, and selector =3D 0x1 + * implies we are selecting bit 1 and we want to set its value to 0. + * + * value =3D 0x2, and selector =3D 0x2 + * implies we are selecting bit 2 and we want to set its value to 1. + * + */ +struct nla_bitfield32 { + __u32 value; + __u32 selector; +}; + +/* + * policy descriptions - it's specific to each family how this is used + * Normally, it should be retrieved via a dump inside another attribute + * specifying where it applies. + */ + +/** + * enum netlink_attribute_type - type of an attribute + * @NL_ATTR_TYPE_INVALID: unused + * @NL_ATTR_TYPE_FLAG: flag attribute (present/not present) + * @NL_ATTR_TYPE_U8: 8-bit unsigned attribute + * @NL_ATTR_TYPE_U16: 16-bit unsigned attribute + * @NL_ATTR_TYPE_U32: 32-bit unsigned attribute + * @NL_ATTR_TYPE_U64: 64-bit unsigned attribute + * @NL_ATTR_TYPE_S8: 8-bit signed attribute + * @NL_ATTR_TYPE_S16: 16-bit signed attribute + * @NL_ATTR_TYPE_S32: 32-bit signed attribute + * @NL_ATTR_TYPE_S64: 64-bit signed attribute + * @NL_ATTR_TYPE_BINARY: binary data, min/max length may be specified + * @NL_ATTR_TYPE_STRING: string, min/max length may be specified + * @NL_ATTR_TYPE_NUL_STRING: NUL-terminated string, + * min/max length may be specified + * @NL_ATTR_TYPE_NESTED: nested, i.e. the content of this attribute + * consists of sub-attributes. The nested policy and maxtype + * inside may be specified. + * @NL_ATTR_TYPE_NESTED_ARRAY: nested array, i.e. the content of this + * attribute contains sub-attributes whose type is irrelevant + * (just used to separate the array entries) and each such array + * entry has attributes again, the policy for those inner ones + * and the corresponding maxtype may be specified. + * @NL_ATTR_TYPE_BITFIELD32: &struct nla_bitfield32 attribute + */ +enum netlink_attribute_type { + NL_ATTR_TYPE_INVALID, + + NL_ATTR_TYPE_FLAG, + + NL_ATTR_TYPE_U8, + NL_ATTR_TYPE_U16, + NL_ATTR_TYPE_U32, + NL_ATTR_TYPE_U64, + + NL_ATTR_TYPE_S8, + NL_ATTR_TYPE_S16, + NL_ATTR_TYPE_S32, + NL_ATTR_TYPE_S64, + + NL_ATTR_TYPE_BINARY, + NL_ATTR_TYPE_STRING, + NL_ATTR_TYPE_NUL_STRING, + + NL_ATTR_TYPE_NESTED, + NL_ATTR_TYPE_NESTED_ARRAY, + + NL_ATTR_TYPE_BITFIELD32, +}; + +/** + * enum netlink_policy_type_attr - policy type attributes + * @NL_POLICY_TYPE_ATTR_UNSPEC: unused + * @NL_POLICY_TYPE_ATTR_TYPE: type of the attribute, + * &enum netlink_attribute_type (U32) + * @NL_POLICY_TYPE_ATTR_MIN_VALUE_S: minimum value for signed + * integers (S64) + * @NL_POLICY_TYPE_ATTR_MAX_VALUE_S: maximum value for signed + * integers (S64) + * @NL_POLICY_TYPE_ATTR_MIN_VALUE_U: minimum value for unsigned + * integers (U64) + * @NL_POLICY_TYPE_ATTR_MAX_VALUE_U: maximum value for unsigned + * integers (U64) + * @NL_POLICY_TYPE_ATTR_MIN_LENGTH: minimum length for binary + * attributes, no minimum if not given (U32) + * @NL_POLICY_TYPE_ATTR_MAX_LENGTH: maximum length for binary + * attributes, no maximum if not given (U32) + * @NL_POLICY_TYPE_ATTR_POLICY_IDX: sub policy for nested and + * nested array types (U32) + * @NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE: maximum sub policy + * attribute for nested and nested array types, this can + * in theory be < the size of the policy pointed to by + * the index, if limited inside the nesting (U32) + * @NL_POLICY_TYPE_ATTR_BITFIELD32_MASK: valid mask for the + * bitfield32 type (U32) + * @NL_POLICY_TYPE_ATTR_MASK: mask of valid bits for unsigned integers (U6= 4) + * @NL_POLICY_TYPE_ATTR_PAD: pad attribute for 64-bit alignment + * + * @__NL_POLICY_TYPE_ATTR_MAX: number of attributes + * @NL_POLICY_TYPE_ATTR_MAX: highest attribute number + */ +enum netlink_policy_type_attr { + NL_POLICY_TYPE_ATTR_UNSPEC, + NL_POLICY_TYPE_ATTR_TYPE, + NL_POLICY_TYPE_ATTR_MIN_VALUE_S, + NL_POLICY_TYPE_ATTR_MAX_VALUE_S, + NL_POLICY_TYPE_ATTR_MIN_VALUE_U, + NL_POLICY_TYPE_ATTR_MAX_VALUE_U, + NL_POLICY_TYPE_ATTR_MIN_LENGTH, + NL_POLICY_TYPE_ATTR_MAX_LENGTH, + NL_POLICY_TYPE_ATTR_POLICY_IDX, + NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE, + NL_POLICY_TYPE_ATTR_BITFIELD32_MASK, + NL_POLICY_TYPE_ATTR_PAD, + NL_POLICY_TYPE_ATTR_MASK, + + /* keep last */ + __NL_POLICY_TYPE_ATTR_MAX, + NL_POLICY_TYPE_ATTR_MAX =3D __NL_POLICY_TYPE_ATTR_MAX - 1 +}; + +#endif /* __LINUX_NETLINK_H */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/841?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I9e27ff335d892429334137d028f8503da4e4ca5b Gerrit-Change-Number: 841 Gerrit-PatchSet: 5 Gerrit-Owner: ordex Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --mEAkM2KlTaA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

ordex uploaded patch set #5 to this change.

View Change

g=
it pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/841/5
<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/dev-tools/special-files.lst b/dev-tools/special-files.lst
index e5f2fc2..8702dfc 100644
--- a/dev-tools= /special-files.lst
+++ b/dev-tools/special-files.lst=
@@ -3,3 +3,4 @@
E:src/compat/compat-lz4.h = # Preserve LZ4 upstream formatting
E:src/openvpn/ov= pn_dco_linux.h # Preserve ovpn-dco upstream formatting
E:src/openvpn/ovpn_dco_win.h # Preserve ovpn-dco-win upstrea= m formatting
+E:src/o= penvpn/netlink.h # Preserve netlink.h upstream formatting

diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.a= m
index ecb2bcf..7ed27a5 100644
--- a/src/o= penvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
= @@ -79,6 +79,7 @@
mbuf.c mbuf.h \
= memdbg.h \
misc.c misc.h \
+ netlink.h \
ovpn_dco_freebsd.h= \
ovpn_dco_linux.h \
ovpn_dco_win.h \<= /span>
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linu= x.c
index b038382..881d495 100644
--- a/src= /openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c@@ -29,6 +29,14 @@

#include &quo= t;syshead.h"

+/* include bundled netlink.h as we need a relatively modern= version
+ * defining= NLMSGERR_ATTR_MISS_NEST and NLMSGERR_ATTR_MISS_TYPE.
+ *
+ * Include it first to make sure that nobody else pulls in= the system
+ * copy.=
+ */
+#include "netlink.h"

+
#inclu= de "dco_linux.h"
#include "errlevel.h"=
#include "buffer.h"
@@ -339,6 += 347,18 @@
(char *)nla_data(tb_msg[NLMSGERR_ATT= R_MSG]));
}

+ if (tb_msg[NLMSGERR_ATTR_MISS_NEST])
+ {
+ msg(M_WARN, "kernel erro= r: missing required nesting type %u\n",
+ nla_get_u32(tb_msg[NLMSGERR_ATTR_MISS_= NEST]));
+ }
+
+ if (tb_msg[NLMSGERR_ATTR_MISS_TYPE])
+ {
+ msg(M_WARN, "kernel erro= r: missing required attribute type %u\n",
+ nla_get_u32(tb_msg[NLMSGERR_ATTR_MIS= S_TYPE]));
+ }
+
r= eturn NL_STOP;
}

diff --= git a/src/openvpn/netlink.h b/src/openvpn/netlink.h
new fil= e mode 100644
index 0000000..47bac97
--- /d= ev/null
+++ b/src/openvpn/netlink.h
@@ -0,0= +1,374 @@
+/* SPDX-L= icense-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef __LINUX_NETLINK_H
+#define __LINUX_NETLINK_H
+
+#include <linux/const.h>
+#include <linux/socket.h> /* fo= r __kernel_sa_family_t */
+#include <linux/types.h>
+
+#d= efine NETLINK_ROUTE 0 /* Routing/device hook */
+#define NETLINK_UNUSED 1 /* Unused numbe= r */
+#define NETL= INK_USERSOCK 2 /* Reserved for user mode socket protocols */
+#define NETLINK_FIREWALL 3 /* Unu= sed number, formerly ip_queue */

+#define NETLINK_SOCK_DIAG 4 /* socket monitoring */=
+#define NETLINK_NFLOG 5 /= * netfilter/iptables ULOG */
+#define NETLINK_XFRM 6 /* ipsec */
+#define NETLINK_SELINUX 7 /* SELinux event notifi= cations */
+#define N= ETLINK_ISCSI 8 /* Open-iSCSI */
+#define NETLINK_AUDIT 9 /* auditing */
+#define NETLINK_FIB_LOOKUP 10
= +#define NETLINK_CONNECTOR 11
+#define NETLINK_NETFI= LTER 12 /* netfilter subsystem */
+#define NETLINK_IP6_FW 13
+#define NETLINK_DNRTMSG 14 /* DECnet routing messages= (obsolete) */
+#defi= ne NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
<= span style=3D"color: hsl(120, 100%, 40%);">+#define NETLINK_GENERIC 16
+/* leave room for NETLI= NK_DM (DM Events) */
= +#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
+#define NETLINK_ECRYPTFS 19
<= span style=3D"color: hsl(120, 100%, 40%);">+#define NETLINK_RDMA 20
=
+#define NETLINK_CRYPTO 21= /* Crypto layer */
+= #define NETLINK_SMC 22 /* SMC monitoring */
+
+#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG
+
+#define MAX_LINKS 32
+
+struc= t sockaddr_nl {
+ __k= ernel_sa_family_t nl_family; /* AF_NETLINK */
+ unsigned short nl_pad; /* zero */
+ __u32 nl_pid; /* port ID */
+ __u32 nl_gro= ups; /* multicast groups mask */
+};
+
+/**
+ * struct nlmsghdr - fixed format metad= ata header of Netlink messages
+ * @nlmsg_len: Length of message including header
+ * @nlmsg_type: Message content= type

+ * @nlmsg_flag= s: Additional flags
+= * @nlmsg_seq: Sequence number
+ * @nlmsg_pid: Sending process port ID
+ */
+struct nlmsghdr {
+ __u32 nlmsg_len;
+ __u16 nlmsg_type;
+ __u16 nlmsg_flags;
+ __u32 nlmsg_seq;
+ __u32 nlmsg_pid;
+};
+

+/* Flags values */
+
+#define NLM_F_REQUEST 0x01 /* It is requ= est message. */
+#de= fine NLM_F_MULTI 0x02 /* Multipart message, terminated by NLMSG_DONE */
+#define NLM_F_ACK 0x0= 4 /* Reply with ack, with zero or error code */
+#define NLM_F_ECHO 0x08 /* Receive resulting n= otifications */
+#def= ine NLM_F_DUMP_INTR 0x10 /* Dump was inconsistent due to sequence change *= /
+#define NLM_F_DUMP= _FILTERED 0x20 /* Dump was filtered as requested */
+
+/* Modifiers to GET request */
+#define NLM_F_ROOT 0x100 /* specify tree root */<= /span>
+#define NLM_F_MATCH = 0x200 /* return all matching */
+#define NLM_F_ATOMIC 0x400 /* atomic GET */
+#define NLM_F_DUMP (NLM_F_ROOT|NLM_F_M= ATCH)
+
+/* Modifiers to NEW request */
+#define NLM_F_REPLACE = 0x100 /* Override existing */
+#define NLM_F_EXCL 0x200 /* Do not touch, if it exists */=
+#define NLM_F_CREATE 0x400= /* Create, if it does not exist */
+#define NLM_F_APPEND 0x800 /* Add to end of list */=
+
+/* Modifiers to DELETE request */
<= span style=3D"color: hsl(120, 100%, 40%);">+#define NLM_F_NONREC 0x100 /* D= o not delete recursively */

+#define NLM_F_BULK 0x200 /* Delete multiple objects */
+

+/* Flags for ACK message */
+#define NLM_F_CAPPED 0x100 /* request was= capped */
+#define N= LM_F_ACK_TLVS 0x200 /* extended ACK TVLs were included */
+
+/*
+ 4.4BSD ADD NLM_F_CREATE|NLM_F_EXCL
+ 4.4BSD CHANGE NLM_F_REPLACE
+
+ True CHANGE NLM_F_CREATE|NLM_F_REPLACE
+ Append NLM_F_CREATE
+ Check NLM_F_EXCL

+ */

+
+#define NLMSG_ALIGNTO 4U
+#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLM= SG_ALIGNTO-1) )
+#def= ine NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
+#define NLMSG_LENGTH(len) ((len)= + NLMSG_HDRLEN)

+#de= fine NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
+#define NLMSG_DATA(nlh) ((void *)(((char= *)nlh) + NLMSG_HDRLEN))
+#define NLMSG_NEXT(nlh,len) ((len) -=3D NLMSG_ALIGN((nlh)->nlmsg_l= en), \
+ (struct= nlmsghdr *)(((char *)(nlh)) + \
+ NLMSG_ALIGN((nlh)->nlmsg_len)))
+#define NLMSG_OK(nlh,len) ((len) >=3D = (int)sizeof(struct nlmsghdr) && \
+ (nlh)->nlmsg_len >=3D sizeof(struct nlmsg= hdr) && \
+ = (nlh)->nlmsg_len <=3D (len))
+#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NL= MSG_SPACE((len)))
+
+#define NLMSG_NOOP 0= x1 /* Nothing. */
+#= define NLMSG_ERROR 0x2 /* Error */
+#define NLMSG_DONE 0x3 /* End of a dump */
+#define NLMSG_OVERRUN 0x4 /* Data= lost */

++#define NLMSG_MIN_TYPE 0x10 = /* < 0x10: reserved control messages */
+
+struct nlmsgerr {
+ int error;
+ stru= ct nlmsghdr msg;
+ /*=
+ * followed by the= message contents unless NETLINK_CAP_ACK was set
+ * or the ACK indicates success (error =3D=3D= 0)
+ * message leng= th is aligned with NLMSG_ALIGN()
+ */
+ /= *
+ * followed by TL= Vs defined in enum nlmsgerr_attrs
+ * if NETLINK_EXT_ACK was set
+ */
+};
+=
+/**
+ * enum nlmsgerr_attrs - nlmsgerr attribu= tes
+ * @NLMSGERR_ATT= R_UNUSED: unused
+ * = @NLMSGERR_ATTR_MSG: error message string (string)
+ * @NLMSGERR_ATTR_OFFS: offset of the invalid= attribute in the original
+ * message, counting from the beginning of the header (u32)<= br>+ * @NLMSGERR_ATTR_COOKIE: a= rbitrary subsystem specific cookie to
+ * be used - in the success case - to identify a created<= /span>
+ * object or operati= on or similar (binary)
+ * @NLMSGERR_ATTR_MISS_TYPE: type = of a missing required attribute,
+ * %NLMSGERR_ATTR_MISS_NEST will not be present if the attribu= te was
+ * missing at= the message level
+ = * @NLMSGERR_ATTR_MISS_NEST: offset of the nest where attribute was missing<= /span>
+ * @__NLMSGERR_ATTR_= MAX: number of attributes
+ * @NLMSGERR_ATTR_MAX: highest attribute number
+ */
+enum nlmsgerr_attrs {
+ NLMSGERR_ATTR_UNUSED,
+ NLMSGERR_ATTR_MSG,
+ NLMSGERR_ATTR_OFFS,
+ NLMSGERR_ATTR_COOKIE,
+ NLMSGERR_ATTR_POLICY,
+ NLMSGERR_ATTR_MISS_TYPE,
+ NLMSGERR_ATTR_MISS_NEST,
+

+ __NLMSGERR_ATTR_MAX,
+ NLMSGERR_ATTR_MAX =3D __NLMSGERR_ATTR_MAX - 1
+};
+
+#define NETLINK_ADD_MEMBERSHIP 1
+#define NETLINK_DROP_MEMBERSHIP 2
= +#define NETLINK_PKTINFO 3
+#define NETLINK_BROADC= AST_ERROR 4
+#define= NETLINK_NO_ENOBUFS 5
+#define NETLINK_TX_RING 7
+#define NETLINK_LISTEN_ALL_NSID 8
+#define NETLINK_LIST_MEMBERSHIPS 9=
+#define NETLINK_CAP_ACK = 10
+#define NETLINK_E= XT_ACK 11
+#define = NETLINK_GET_STRICT_CHK 12
+
+struct nl_pk= tinfo {
+ __u32 group= ;
+};
+

+struct nl_mmap_req {
+ unsigned int nm_block_size;
+ unsigned int nm_block_nr;
+ unsigned int nm_frame_size;+ unsigned int nm_frame_nr;
+};
+
+struct nl_mmap_hdr {
+ unsigned int nm_status;
+ unsigned int nm_len;
+ __u32 nm_group;
+ /* credentials */
+ __u32 nm_pid;
+ __u32 nm_uid;
+ __u32 nm_gid;
+};
+
+enum nl_mmap_status {
+ NL_MMAP_STATUS_UNUSED,=
+ NL_MMAP_STATUS_RES= ERVED,
+ NL_MMAP_STAT= US_VALID,
+ NL_MMAP_S= TATUS_COPY,
+ NL_MMAP= _STATUS_SKIP,
+};
+
+#define NL_MMAP_MSG_ALIGNMENT NLMSG_ALIG= NTO
+#define NL_MMAP_= MSG_ALIGN(sz) __ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)
+#define NL_MMAP_HDRLEN NL_MMAP_MSG_A= LIGN(sizeof(struct nl_mmap_hdr))
+
+#defin= e NET_MAJOR 36 /* Major 36 is reserved for networking */
<= span style=3D"color: hsl(120, 100%, 40%);">+

+enum {
+ NETLINK_UNCONNECTED =3D 0,
+ NETLINK_CONNECTED,
+};
+/*
+ * <------- NLA_HDRLEN ------= > <-- NLA_ALIGN(payload)-->

+ * +---------------------+- - -+- - - - - - - - - -+- - -+=
+ * | Header = | Pad | Payload | Pad |
+ * | (struct nlattr) | ing | | in= g |
+ * +------------= ---------+- - -+- - - - - - - - - -+- - -+
+ * <-------------- nlattr->nla_len ----------= ---->
+ */<= br>+
+struct nlattr {
+ __u16 nla_len;
+ __u16 nla_type;
+};
+
+/*
+ * nla_type (16= bits)
+ * +---+---+-= ------------------------------+
+ * | N | O | Attribute Type |
+ * +---+---+--------------------------= -----+
+ * N :=3D Car= ries nested attributes
+ *
+ * Note: The N and O flag are mutually exclusive.
+ */

+#define NLA_F_NESTED (1 << 15)
= +#define NLA_F_NET_BYTEORDER (1= << 14)
+#defin= e NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
+
+#define NLA_ALIGNTO 4
+#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) &= ~(NLA_ALIGNTO - 1))
= +#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr)))
+

+/* Generic 32 bitflags attribute content sent to the= kernel.
+ *+ * The value is a bitmap tha= t defines the values being set
+ * The selector is a bitmask that defines which value is legit
+ *
+ * Examples:
+ * value =3D 0x0, and selector =3D 0x1
+ * implies we are select= ing bit 1 and we want to set its value to 0.
+ *
+ * value =3D 0x2, and selector =3D 0x2
+ * implies we are selecting bit 2 and we want = to set its value to 1.
+ */
= +struct nla_bitfield32 {=
+ __u32 value;
+ __u32 selector;

+};

+
+/*
+ * policy des= criptions - it's specific to each family how this is used
+ * Normally, it should be retriev= ed via a dump inside another attribute

+ * specifying where it applies.
+ */
+
+/**<= /span>
+ * enum netlink_attr= ibute_type - type of an attribute
+ * @NL_ATTR_TYPE_INVALID: unused
+ * @NL_ATTR_TYPE_FLAG: flag attribute (present/n= ot present)
+ * @NL_A= TTR_TYPE_U8: 8-bit unsigned attribute
+ * @NL_ATTR_TYPE_U16: 16-bit unsigned attribute+ * @NL_ATTR_TYPE_U32: 32-bit = unsigned attribute
+ = * @NL_ATTR_TYPE_U64: 64-bit unsigned attribute
+ * @NL_ATTR_TYPE_S8: 8-bit signed attribute
+ * @NL_ATTR_TYPE_S16: 16= -bit signed attribute
+ * @NL_ATTR_TYPE_S32: 32-bit signed attribute
+ * @NL_ATTR_TYPE_S64: 64-bit signed attribute
+ * @NL_ATTR_TYPE_BINA= RY: binary data, min/max length may be specified
+ * @NL_ATTR_TYPE_STRING: string, min/max lengt= h may be specified
+ = * @NL_ATTR_TYPE_NUL_STRING: NUL-terminated string,
+ * min/max length may be specified+ * @NL_ATTR_TYPE_NESTED: nest= ed, i.e. the content of this attribute
+ * consists of sub-attributes. The nested policy and max= type
+ * inside may b= e specified.
+ * @NL_= ATTR_TYPE_NESTED_ARRAY: nested array, i.e. the content of this
+ * attribute contains sub-attrib= utes whose type is irrelevant

+ * (just used to separate the array entries) and each such array<= /span>
+ * entry has attribu= tes again, the policy for those inner ones
+ * and the corresponding maxtype may be specified.
+ * @NL_ATTR_TYPE_BITF= IELD32: &struct nla_bitfield32 attribute
+ */
+enum netlink_attribute_type {
+ NL_ATTR_TYPE_INVALID,
+
+ NL_ATTR_TYPE_U8= ,
+ NL_ATTR_TYPE_U16,=
+ NL_ATTR_TYPE_U32,<= /span>
+ NL_ATTR_TYPE_U64,
+
+ NL_ATTR_TYPE_S8,
+ NL_ATTR_TYPE_S16,
+ NL_ATTR_TYPE_S32,
+ NL_ATTR_TYPE_S64,
+
+ NL_ATTR_TYPE_BINARY,
+ NL_ATTR_TYPE_STRING,
+ NL_ATTR_TYPE_NUL_STRING,
+
+ NL_ATTR_TYPE_NESTED,
+ NL_ATTR_TYPE_NESTED_ARRAY,
+
+ NL= _ATTR_TYPE_BITFIELD32,
+
+/**

+ * enum netlink_policy_type_attr - policy type at= tributes
+ * @NL_POLI= CY_TYPE_ATTR_UNSPEC: unused
+ * @NL_POLICY_TYPE_ATTR_TYPE: type of the attribute,
+ * &enum netlink_attribute_typ= e (U32)

+ * @NL_POLIC= Y_TYPE_ATTR_MIN_VALUE_S: minimum value for signed
+ * integers (S64)
+ * @NL_POLICY_TYPE_ATTR_MAX_VALUE_S: maximum va= lue for signed
+ * in= tegers (S64)
+ * @NL_= POLICY_TYPE_ATTR_MIN_VALUE_U: minimum value for unsigned
+ * integers (U64)
+ * @NL_POLICY_TYPE_ATTR_MAX_VALUE_U: max= imum value for unsigned
+ * integers (U64)
+ * @NL_POLICY_TYPE_ATTR_MIN_LENGTH: minimum length for binary
<= span style=3D"color: hsl(120, 100%, 40%);">+ * attributes, no minimum if no= t given (U32)

+ * @NL= _POLICY_TYPE_ATTR_MAX_LENGTH: maximum length for binary
+ * attributes, no maximum if not given = (U32)
+ * @NL_POLICY_= TYPE_ATTR_POLICY_IDX: sub policy for nested and
+ * nested array types (U32)
+ * @NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE:= maximum sub policy
+= * attribute for nested and nested array types, this can
+ * in theory be < the size of the p= olicy pointed to by
+= * the index, if limited inside the nesting (U32)
+ * @NL_POLICY_TYPE_ATTR_BITFIELD32_MASK: vali= d mask for the
+ * bi= tfield32 type (U32)
+= * @NL_POLICY_TYPE_ATTR_MASK: mask of valid bits for unsigned integers (U64= )
+ * @NL_POLICY_TYPE= _ATTR_PAD: pad attribute for 64-bit alignment
+ *
+ * @__NL_POLICY_TYPE_ATTR_MAX: number of attributes
+ * @NL_POLICY_TYPE_ATTR_MAX: highe= st attribute number

+= */
+enum netlink_pol= icy_type_attr {
+ NL_= POLICY_TYPE_ATTR_UNSPEC,
+ NL_POLICY_TYPE_ATTR_TYPE,
+ NL_POLICY_TYPE_ATTR_MIN_VALUE_S,
+ NL_POLICY_TYPE_ATTR_MAX_VALUE_S,
+ NL_POLICY_TYPE_ATTR_MIN_VALUE_U,
+ NL_POLICY_TYPE_ATTR_= MAX_VALUE_U,
+ NL_POL= ICY_TYPE_ATTR_MIN_LENGTH,
+ NL_POLICY_TYPE_ATTR_MAX_LENGTH,
+ NL_POLICY_TYPE_ATTR_POLICY_IDX,
+ NL_POLICY_TYPE_ATTR_POLICY_MAXTYPE,
+ NL_POLICY_TYPE_ATTR_BIT= FIELD32_MASK,
+ NL_PO= LICY_TYPE_ATTR_PAD,
+= NL_POLICY_TYPE_ATTR_MASK,
+
+ /* keep las= t */
+ __NL_POLICY_TY= PE_ATTR_MAX,
+ NL_POL= ICY_TYPE_ATTR_MAX =3D __NL_POLICY_TYPE_ATTR_MAX - 1
+};
+
+#e= ndif /* __LINUX_NETLINK_H */

To view, v= isit chan= ge 841. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9e27ff335d892429334137d028f= 8503da4e4ca5b
Gerrit-Change-Number: 841
Gerrit-PatchSet: 5
Gerrit-Owner: ordex <a@...2181...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--mEAkM2KlTaA=--