netlink: add NETLINK_BROADCAST_ERROR socket option
Subsystems (2)
PATCH 1/1 netlink: add NETLINK_BROADCAST_ERROR socket option
This patch adds NETLINK_BROADCAST_ERROR which is a netlink socket option that the listener can set to make netlink_broadcast() return errors in the delivery to the caller. This option is useful if the caller of netlink_broadcast() do something with the result of the message delivery, like in ctnetlink where it drops a network packet if the event delivery failed, this is used to enable reliable logging and state-synchronization. If this socket option is not set, netlink_broadcast() only reports ESRCH errors and silently ignore ENOBUFS errors, which is what most netlink_broadcast() callers should do.
This socket option is based on a suggestion from Patrick McHardy.
---
include/linux/netlink.h | 1 + net/netlink/af_netlink.c | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-)
include/linux/netlink.h +1 -0
@@ -103,6 +103,7 @@ struct nlmsgerr#define NETLINK_ADD_MEMBERSHIP 1#define NETLINK_DROP_MEMBERSHIP 2#define NETLINK_PKTINFO 3 +#define NETLINK_BROADCAST_ERROR 4struct nl_pktinfo {
net/netlink/af_netlink.c +23 -3
@@ -85,6 +85,7 @@ struct netlink_sock {#define NETLINK_KERNEL_SOCKET 0x1#define NETLINK_RECV_PKTINFO 0x2 +#define NETLINK_BROADCAST_SEND_ERROR 0x4static inline struct netlink_sock *nlk_sk (struct sock *sk) {
@@ -973,7 +974,7 @@ static inline int do_one_broadcast(struct sock *sk,if (!net_eq (sock_net (sk), p->net)) goto out; -if (p->failure) { +if ((nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) && p->failure) {netlink_overrun (sk); goto out; }
@@ -994,13 +995,15 @@ static inline int do_one_broadcast(struct sock *sk,if (p->skb2 ==NULL ) {netlink_overrun (sk);/* Clone failed. Notify ALL listeners. */ - p->failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->failure =1 ; }else if (sk_filter (sk, p->skb2)) {kfree_skb (p->skb2); p->skb2 =NULL ; }else if ((val =netlink_broadcast_deliver (sk, p->skb2)) <0 ) {netlink_overrun (sk); - p->delivery_failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->delivery_failure =1 ; }else { p->congested |= val; p->delivered =1 ;
@@ -1163,6 +1166,13 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname, err =0 ;break ; } +case NETLINK_BROADCAST_ERROR : +if (val) + nlk->flags |=NETLINK_BROADCAST_SEND_ERROR ; +else + nlk->flags &= ~NETLINK_BROADCAST_SEND_ERROR ; + err =0 ; +break ;default : err = -ENOPROTOOPT ; }
@@ -1195,6 +1205,16 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,return -EFAULT ; err =0 ;break ; +case NETLINK_BROADCAST_ERROR : +if (len <sizeof (int )) +return -EINVAL ; + len =sizeof (int ); + val = nlk->flags &NETLINK_BROADCAST_SEND_ERROR ?1 :0 ; +if (put_user (len, optlen) || +put_user (val, optval)) +return -EFAULT ; + err =0 ; +break ;default : err = -ENOPROTOOPT ; }
Quoted 11 lines · Pablo Neira Ayuso
net/netlink/af_netlink.c +1
-1@@ -973,7 +974,7 @@ static inline int do_one_broadcast(struct sock *sk,if (!net_eq (sock_net (sk), p->net)) goto out; -if (p->failure) { +if ((nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) && p->failure) {netlink_overrun (sk); goto out; }
net/netlink/af_netlink.c static inline int do_one_broadcast(struct sock *sk, · line 999
Quoted 6 lines
net/netlink/af_netlink.c +2
-1@@ -994,13 +995,15 @@ static inline int do_one_broadcast(struct sock *sk,if (p->skb2 ==NULL ) {netlink_overrun (sk);/* Clone failed. Notify ALL listeners. */ - p->failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->failure =1 ;
Almost :) If we didn't manage to clone, we can't deliver to *any* socket, so the check in the first chunk above is incorrect. It needs to always call netlink_overrun(), additionally it needs to set delivery_failure when the SEND_ERROR flag is present.
Something like this:
if (p->failure) {
+ if (nlk->flags & NETLINK_BROADCAST_SEND_ERROR)
+ p->delivery_failure = 1;
netlink_overrun(sk);
goto out;
}
Quoted 11 lines
net/netlink/af_netlink.c +2
-1}else if (sk_filter (sk, p->skb2)) {kfree_skb (p->skb2); p->skb2 =NULL ; }else if ((val =netlink_broadcast_deliver (sk, p->skb2)) <0 ) {netlink_overrun (sk); - p->delivery_failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->delivery_failure =1 ; }else { p->congested |= val; p->delivered =1 ;
Quoted 11 lines · Patrick McHardy
Quoted 10 lines · Pablo Neira Ayuso
net/netlink/af_netlink.c +1
-1@@ -973,7 +974,7 @@ static inline int do_one_broadcast(struct sock *sk,if (!net_eq (sock_net (sk), p->net)) goto out; -if (p->failure) { +if ((nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) && p->failure) {netlink_overrun (sk); goto out; }
Quoted 12 lines
net/netlink/af_netlink.c static inline int do_one_broadcast(struct sock *sk, · line 999
Quoted 7 lines
net/netlink/af_netlink.c +2
-1@@ -994,13 +995,15 @@ static inline int do_one_broadcast(struct sock *sk,if (p->skb2 ==NULL ) {netlink_overrun (sk);/* Clone failed. Notify ALL listeners. */ - p->failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->failure =1 ;Almost :) If we didn't manage to clone, we can't deliver to *any* socket, so the check in the first chunk above is incorrect. It needs to always call
netlink_overrun(), additionally it needs to setdelivery_failurewhen theSEND_ERRORflag is present.
Hm, I'm getting lost with this :), I thought that we agreed that sockets without the flag set should not skip.
Quoted 5 lines
Something like this:
if (p->failure) {+ if (
nlk->flags&NETLINK_BROADCAST_SEND_ERROR)
+p->delivery_failure= 1;
Then, I think that the previous patch that I sent should be OK (including the flag renaming, of course), because p->delivery_failure is set if delivery failed and p->failure is set when clone failed. In any case, (p->failure || p->delivery_failure) results in a error report, so this would not change anything.
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers
Quoted 13 lines · Pablo Neira Ayuso
Quoted 11 lines · Patrick McHardy
net/netlink/af_netlink.c static inline int do_one_broadcast(struct sock *sk, · line 999
Quoted 7 lines
net/netlink/af_netlink.c +2
-1@@ -994,13 +995,15 @@ static inline int do_one_broadcast(struct sock *sk,if (p->skb2 ==NULL ) {netlink_overrun (sk);/* Clone failed. Notify ALL listeners. */ - p->failure =1 ; +if (nlk->flags &NETLINK_BROADCAST_SEND_ERROR ) + p->failure =1 ;Almost :) If we didn't manage to clone, we can't deliver to *any* socket, so the check in the first chunk above is incorrect. It needs to always call
netlink_overrun(), additionally it needs to setdelivery_failurewhen theSEND_ERRORflag is present.
Quoted 2 lines
Hm, I'm getting lost with this :), I thought that we agreed that sockets without the flag set should not skip.
Right, but you don't have a choice in that case as you don't even have the first skb cloned. It will crash.
Quoted 11 lines
Quoted 5 lines
Something like this:
if (p->failure) {+ if (
nlk->flags&NETLINK_BROADCAST_SEND_ERROR)
+p->delivery_failure= 1;Then, I think that the previous patch that I sent should be OK (including the flag renaming, of course), because
p->delivery_failureis set if delivery failed andp->failureis set when clone failed. In any case, (p->failure||p->delivery_failure) results in a error report, so this would not change anything.
The last one set p->failure for a deliver failure. It should set p->delivery_failure, otherwise you *do* start skipping other sockets.