[PATCH bpf-next 4/4] xsk: lock the control mutex in sock_diag interface

[Björn Töpel]

From: Björn Töpel <bjorn.to...@intel.com>

When accessing the members of an XDP socket, the control mutex should
be held. This commit fixes that.

Fixes: a36b38aa2af6 ("xsk: add sock_diag interface for AF_XDP")
Signed-off-by: Björn Töpel <bjorn.to...@intel.com>
---
 net/xdp/xsk_diag.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/xdp/xsk_diag.c b/net/xdp/xsk_diag.c
index d5e06c8e0cbf..c8f4f11edbbc 100644
--- a/net/xdp/xsk_diag.c
+++ b/net/xdp/xsk_diag.c
@@ -97,6 +97,7 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff 
*nlskb,
        msg->xdiag_ino = sk_ino;
        sock_diag_save_cookie(sk, msg->xdiag_cookie);
 
+       mutex_lock(&xs->mutex);
        if ((req->xdiag_show & XDP_SHOW_INFO) && xsk_diag_put_info(xs, nlskb))
                goto out_nlmsg_trim;
 
@@ -117,10 +118,12 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff 
*nlskb,
            sock_diag_put_meminfo(sk, nlskb, XDP_DIAG_MEMINFO))
                goto out_nlmsg_trim;
 
+       mutex_unlock(&xs->mutex);
        nlmsg_end(nlskb, nlh);
        return 0;
 
 out_nlmsg_trim:
+       mutex_unlock(&xs->mutex);
        nlmsg_cancel(nlskb, nlh);
        return -EMSGSIZE;
 }
-- 
2.20.1