From: Kees Cook <keescook@chromium.org>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: LKML <linux-kernel@vger.kernel.org>,
Jamal Hadi Salim <jhs@mojatatu.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Jiri Pirko <jiri@resnulli.us>,
"David S. Miller" <davem@davemloft.net>,
Network Development <netdev@vger.kernel.org>
Subject: Re: [PATCH] net: sched: Fix memory exposure from short TCA_U32_SEL
Date: Sat, 25 Aug 2018 23:19:30 -0700 [thread overview]
Message-ID: <CAGXu5jK7VzayzZTcxgZBf-+YHWO+Hv7s8utj2rzTc3gFtA8pFQ@mail.gmail.com> (raw)
In-Reply-To: <20180826061534.GT6515@ZenIV.linux.org.uk>
On Sat, Aug 25, 2018 at 11:15 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> On Sat, Aug 25, 2018 at 10:58:01PM -0700, Kees Cook wrote:
>> Via u32_change(), TCA_U32_SEL has an unspecified type in the netlink
>> policy, so max length isn't enforced, only minimum. This means nkeys
>> (from userspace) was being trusted without checking the actual size of
>> nla_len(), which could lead to a memory over-read, and ultimately an
>> exposure via a call to u32_dump(). Reachability is CAP_NET_ADMIN within
>> a namespace.
>>
>> Reported-by: Al Viro <viro@zeniv.linux.org.uk>
>> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
>> Cc: Cong Wang <xiyou.wangcong@gmail.com>
>> Cc: Jiri Pirko <jiri@resnulli.us>
>> Cc: "David S. Miller" <davem@davemloft.net>
>> Cc: netdev@vger.kernel.org
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> ---
>> This should go through -stable please, but I have left off the "Cc:
>> stable" as per netdev patch policy. Note that use of struct_size()
>> will need manual expansion in backports, such as:
>> sel_size = sizeof(*s) + sizeof(*s->keys) * s->nkeys;
>
> Saner approach would be sel_size = offsetof(struct tc_u32_sel, keys[s->nkeys])...
Either is fine by me.
>> + sel_size = struct_size(s, keys, s->nkeys);
>> + if (nla_len(tb[TCA_U32_SEL]) < sel_size) {
>> + err = -EINVAL;
>> + goto erridr;
>> + }
>>
>> - n = kzalloc(sizeof(*n) + s->nkeys*sizeof(struct tc_u32_key), GFP_KERNEL);
>> + n = kzalloc(offsetof(typeof(*n), sel) + sel_size, GFP_KERNEL);
>
> ITYM
> n = kzalloc(offsetof(struct tc_u_common, sel.keys[s->nkeys]), GFP_KERNEL);
I prefer to reuse sel_size and keep typeof() to keep things tied to
"n" more directly. *shrug*
-Kees
--
Kees Cook
Pixel Security
next prev parent reply other threads:[~2018-08-26 6:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-26 5:58 [PATCH] net: sched: Fix memory exposure from short TCA_U32_SEL Kees Cook
2018-08-26 6:15 ` Al Viro
2018-08-26 6:19 ` Kees Cook [this message]
2018-08-26 17:30 ` Jamal Hadi Salim
2018-08-26 21:56 ` Kees Cook
2018-08-27 11:46 ` Jamal Hadi Salim
2018-08-27 14:08 ` Kees Cook
2018-08-27 14:26 ` Roman Mashak
2018-08-26 17:32 ` Al Viro
2018-08-26 18:57 ` Joe Perches
2018-08-26 21:24 ` Al Viro
2018-08-26 22:26 ` Joe Perches
2018-08-26 22:43 ` Al Viro
2018-08-27 2:00 ` Julia Lawall
2018-08-27 2:35 ` Al Viro
2018-08-27 3:35 ` Julia Lawall
2018-08-27 4:04 ` Al Viro
2018-08-27 4:41 ` Julia Lawall
2018-08-27 1:59 ` Julia Lawall
2018-08-26 22:57 ` Al Viro
2018-08-27 11:57 ` Jamal Hadi Salim
2018-08-27 21:31 ` Cong Wang
2018-08-28 0:03 ` Al Viro
2018-08-28 15:59 ` Al Viro
2018-08-31 4:03 ` Al Viro
2018-08-29 19:07 ` Cong Wang
2018-08-29 21:33 ` Al Viro
2018-08-26 21:22 ` David Miller
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=CAGXu5jK7VzayzZTcxgZBf-+YHWO+Hv7s8utj2rzTc3gFtA8pFQ@mail.gmail.com \
--to=keescook@chromium.org \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xiyou.wangcong@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).