From: Peilin Ye <yepeilin.cs@gmail.com>
To: "Daniel Borkmann" <daniel@iogearbox.net>,
"Song Liu" <songliubraving@fb.com>,
"Björn Töpel" <bjorn.topel@intel.com>,
"Magnus Karlsson" <magnus.karlsson@intel.com>,
"Jonathan Lemon" <jonathan.lemon@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Martin KaFai Lau <kafai@fb.com>, Yonghong Song <yhs@fb.com>,
Andrii Nakryiko <andriin@fb.com>, KP Singh <kpsingh@chromium.org>,
linux-kernel-mentees@lists.linuxfoundation.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [Linux-kernel-mentees] [PATCH net v2] xdp: Prevent kernel-infoleak in xsk_getsockopt()
Date: Tue, 28 Jul 2020 07:07:15 -0400 [thread overview]
Message-ID: <20200728110715.GA407606@PWN> (raw)
In-Reply-To: <916dbfd3-e601-c4be-41f0-97efc4aaa456@iogearbox.net>
On Tue, Jul 28, 2020 at 12:53:59PM +0200, Daniel Borkmann wrote:
> On 7/28/20 7:36 AM, Peilin Ye wrote:
> > xsk_getsockopt() is copying uninitialized stack memory to userspace when
> > `extra_stats` is `false`. Fix it.
> >
> > Fixes: 8aa5a33578e9 ("xsk: Add new statistics")
> > Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > ---
> > 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.
>
> I've added above explanation to the commit log since it's useful reasoning for later
> on 'why' something has been done a certain way. Applied, thanks Peilin!
Ah, I see. Thank you for reviewing the patch!
Peilin Ye
WARNING: multiple messages have this Message-ID (diff)
From: Peilin Ye <yepeilin.cs@gmail.com>
To: "Daniel Borkmann" <daniel@iogearbox.net>,
"Song Liu" <songliubraving@fb.com>,
"Björn Töpel" <bjorn.topel@intel.com>,
"Magnus Karlsson" <magnus.karlsson@intel.com>,
"Jonathan Lemon" <jonathan.lemon@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Jesper Dangaard Brouer <hawk@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
John Fastabend <john.fastabend@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Martin KaFai Lau <kafai@fb.com>,
netdev@vger.kernel.org, Yonghong Song <yhs@fb.com>,
KP Singh <kpsingh@chromium.org>, Jakub Kicinski <kuba@kernel.org>,
bpf@vger.kernel.org, Andrii Nakryiko <andriin@fb.com>,
"David S. Miller" <davem@davemloft.net>,
Dan Carpenter <dan.carpenter@oracle.com>,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: Re: [Linux-kernel-mentees] [PATCH net v2] xdp: Prevent kernel-infoleak in xsk_getsockopt()
Date: Tue, 28 Jul 2020 07:07:15 -0400 [thread overview]
Message-ID: <20200728110715.GA407606@PWN> (raw)
In-Reply-To: <916dbfd3-e601-c4be-41f0-97efc4aaa456@iogearbox.net>
On Tue, Jul 28, 2020 at 12:53:59PM +0200, Daniel Borkmann wrote:
> On 7/28/20 7:36 AM, Peilin Ye wrote:
> > xsk_getsockopt() is copying uninitialized stack memory to userspace when
> > `extra_stats` is `false`. Fix it.
> >
> > Fixes: 8aa5a33578e9 ("xsk: Add new statistics")
> > Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > ---
> > 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.
>
> I've added above explanation to the commit log since it's useful reasoning for later
> on 'why' something has been done a certain way. Applied, thanks Peilin!
Ah, I see. Thank you for reviewing the patch!
Peilin Ye
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-07-28 11:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 2:28 [Linux-kernel-mentees] [PATCH net] xdp: Prevent kernel-infoleak in xsk_getsockopt() Peilin Ye
2020-07-28 2:28 ` Peilin Ye
2020-07-28 5:07 ` Song Liu
2020-07-28 5:07 ` Song Liu
2020-07-28 5:25 ` Peilin Ye
2020-07-28 5:25 ` Peilin Ye
2020-07-28 5:36 ` [Linux-kernel-mentees] [PATCH net v2] " Peilin Ye
2020-07-28 5:36 ` Peilin Ye
2020-07-28 6:13 ` Björn Töpel
2020-07-28 6:13 ` Björn Töpel
2020-07-28 6:15 ` Song Liu
2020-07-28 6:15 ` Song Liu via Linux-kernel-mentees
2020-07-28 7:34 ` Arnd Bergmann
2020-07-28 7:34 ` Arnd Bergmann
2020-07-28 10:53 ` Daniel Borkmann
2020-07-28 10:53 ` Daniel Borkmann
2020-07-28 11:07 ` Peilin Ye [this message]
2020-07-28 11:07 ` Peilin Ye
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728110715.GA407606@PWN \
--to=yepeilin.cs@gmail.com \
--cc=andriin@fb.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.