xdp: Prevent kernel-infoleak in xsk_getsockopt()
authorPeilin Ye <yepeilin.cs@gmail.com>
Tue, 28 Jul 2020 05:36:04 +0000 (01:36 -0400)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 28 Jul 2020 10:50:15 +0000 (12:50 +0200)
commit3c4f850e8441ac8b3b6dbaa6107604c4199ef01f
treee71a1c747f21c9b1da813dbca97c10c61fbe071f
parentf6dfbe31e8fa5cbd5bc89df9d7f0fa0af7e69981
xdp: Prevent kernel-infoleak in xsk_getsockopt()

xsk_getsockopt() is copying uninitialized stack memory to userspace when
'extra_stats' is 'false'. Fix it. Doing '= {};' is sufficient since currently
'struct xdp_statistics' is defined as follows:

  struct xdp_statistics {
    __u64 rx_dropped;
    __u64 rx_invalid_descs;
    __u64 tx_invalid_descs;
    __u64 rx_ring_full;
    __u64 rx_fill_ring_empty_descs;
    __u64 tx_ring_empty_descs;
  };

When being copied to the userspace, 'stats' will not contain any uninitialized
'holes' between struct fields.

Fixes: 8aa5a33578e9 ("xsk: Add new statistics")
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Björn Töpel <bjorn.topel@intel.com>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/bpf/20200728053604.404631-1-yepeilin.cs@gmail.com
net/xdp/xsk.c