[Devel] [PATCH 2/2 RH7 v2] netlink: add an option to set sk->err from userspace
Andrey Zhadchenko
andrey.zhadchenko at virtuozzo.com
Thu Oct 29 15:22:20 MSK 2020
Sometimes during dump criu can encounter sockets with overflown kernel buffer,
which results in ENOBUFS error during next read. We need an reliable way
to restore sk->sk_err.
https://jira.sw.ru/browse/PSBM-120976
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko at virtuozzo.com>
---
v2: add an option to return EINVAL
include/uapi/linux/netlink.h | 1 +
net/netlink/af_netlink.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 3756be5..62f8b4b 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -115,6 +115,7 @@ struct nlmsgerr {
#define NETLINK_CAP_ACK 10
#define NETLINK_REPAIR2 127
+#define NETLINK_SETERR 128
struct nl_pktinfo {
__u32 group;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 6c99bca..6e0af810 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1542,6 +1542,16 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname,
nlk->flags &= ~NETLINK_F_REPAIR;
err = 0;
break;
+ case NETLINK_SETERR:
+ err = -ENOPROTOOPT;
+ if (nlk->flags & NETLINK_F_REPAIR) {
+ if (!val || val > MAX_ERRNO)
+ return -EINVAL;
+ sk->sk_err = val;
+ sk->sk_error_report(sk);
+ err = 0;
+ }
+ break;
case NETLINK_PKTINFO:
if (val)
nlk->flags |= NETLINK_F_RECV_PKTINFO;
--
1.8.3.1
More information about the Devel
mailing list