lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 May 2022 08:13:12 -0700 From: Kees Cook <keescook@...omium.org> To: Johannes Berg <johannes@...solutions.net> Cc: "Gustavo A . R . Silva" <gustavoars@...nel.org>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Eric Dumazet <edumazet@...gle.com>, linux-wireless@...r.kernel.org, netdev@...r.kernel.org, Alexei Starovoitov <ast@...nel.org>, alsa-devel@...a-project.org, Al Viro <viro@...iv.linux.org.uk>, Andrew Gabbasov <andrew_gabbasov@...tor.com>, Andrew Morton <akpm@...ux-foundation.org>, Andy Gross <agross@...nel.org>, Andy Lavr <andy.lavr@...il.com>, Arend van Spriel <aspriel@...il.com>, Baowen Zheng <baowen.zheng@...igine.com>, Bjorn Andersson <bjorn.andersson@...aro.org>, Boris Ostrovsky <boris.ostrovsky@...cle.com>, Bradley Grove <linuxdrivers@...otech.com>, brcm80211-dev-list.pdl@...adcom.com, Christian Brauner <brauner@...nel.org>, Christian Göttsche <cgzones@...glemail.com>, Christian Lamparter <chunkeey@...glemail.com>, Chris Zankel <chris@...kel.net>, Cong Wang <cong.wang@...edance.com>, Daniel Axtens <dja@...ens.net>, Daniel Vetter <daniel.vetter@...ll.ch>, Dan Williams <dan.j.williams@...el.com>, David Gow <davidgow@...gle.com>, David Howells <dhowells@...hat.com>, Dennis Dalessandro <dennis.dalessandro@...nelisnetworks.com>, devicetree@...r.kernel.org, Dexuan Cui <decui@...rosoft.com>, Dmitry Kasatkin <dmitry.kasatkin@...il.com>, Eli Cohen <elic@...dia.com>, Eric Paris <eparis@...isplace.org>, Eugeniu Rosca <erosca@...adit-jv.com>, Felipe Balbi <balbi@...nel.org>, Francis Laniel <laniel_francis@...vacyrequired.com>, Frank Rowand <frowand.list@...il.com>, Franky Lin <franky.lin@...adcom.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Gregory Greenman <gregory.greenman@...el.com>, Guenter Roeck <linux@...ck-us.net>, Haiyang Zhang <haiyangz@...rosoft.com>, Hante Meuleman <hante.meuleman@...adcom.com>, Herbert Xu <herbert@...dor.apana.org.au>, Hulk Robot <hulkci@...wei.com>, "James E.J. Bottomley" <jejb@...ux.ibm.com>, James Morris <jmorris@...ei.org>, Jarkko Sakkinen <jarkko@...nel.org>, Jaroslav Kysela <perex@...ex.cz>, Jason Gunthorpe <jgg@...pe.ca>, Jens Axboe <axboe@...nel.dk>, Johan Hedberg <johan.hedberg@...il.com>, John Keeping <john@...anate.com>, Juergen Gross <jgross@...e.com>, Kalle Valo <kvalo@...nel.org>, Keith Packard <keithp@...thp.com>, keyrings@...r.kernel.org, kunit-dev@...glegroups.com, Kuniyuki Iwashima <kuniyu@...zon.co.jp>, "K. Y. Srinivasan" <kys@...rosoft.com>, Lars-Peter Clausen <lars@...afoo.de>, Lee Jones <lee.jones@...aro.org>, Leon Romanovsky <leon@...nel.org>, Liam Girdwood <lgirdwood@...il.com>, linux1394-devel@...ts.sourceforge.net, linux-afs@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org, linux-arm-msm@...r.kernel.org, linux-bluetooth@...r.kernel.org, linux-hardening@...r.kernel.org, linux-hyperv@...r.kernel.org, linux-integrity@...r.kernel.org, linux-rdma@...r.kernel.org, linux-scsi@...r.kernel.org, linux-security-module@...r.kernel.org, linux-usb@...r.kernel.org, linux-xtensa@...ux-xtensa.org, llvm@...ts.linux.dev, Loic Poulain <loic.poulain@...aro.org>, Louis Peens <louis.peens@...igine.com>, Luca Coelho <luciano.coelho@...el.com>, Luiz Augusto von Dentz <luiz.dentz@...il.com>, Marc Dionne <marc.dionne@...istor.com>, Marcel Holtmann <marcel@...tmann.org>, Mark Brown <broonie@...nel.org>, "Martin K. Petersen" <martin.petersen@...cle.com>, Max Filippov <jcmvbkbc@...il.com>, Mimi Zohar <zohar@...ux.ibm.com>, Muchun Song <songmuchun@...edance.com>, Nathan Chancellor <nathan@...nel.org>, Nick Desaulniers <ndesaulniers@...gle.com>, Nuno Sá <nuno.sa@...log.com>, Paul Moore <paul@...l-moore.com>, Rich Felker <dalias@...ifal.cx>, Rob Herring <robh+dt@...nel.org>, Russell King <linux@...linux.org.uk>, selinux@...r.kernel.org, "Serge E. Hallyn" <serge@...lyn.com>, SHA-cyfmac-dev-list@...ineon.com, Simon Horman <simon.horman@...igine.com>, Stefano Stabellini <sstabellini@...nel.org>, Stefan Richter <stefanr@...6.in-berlin.de>, Steffen Klassert <steffen.klassert@...unet.com>, Stephen Hemminger <sthemmin@...rosoft.com>, Stephen Smalley <stephen.smalley.work@...il.com>, Tadeusz Struk <tadeusz.struk@...aro.org>, Takashi Iwai <tiwai@...e.com>, Tom Rix <trix@...hat.com>, Udipto Goswami <quic_ugoswami@...cinc.com>, Vincenzo Frascino <vincenzo.frascino@....com>, wcn36xx@...ts.infradead.org, Wei Liu <wei.liu@...nel.org>, xen-devel@...ts.xenproject.org, Xiu Jianfeng <xiujianfeng@...wei.com>, Yang Yingliang <yangyingliang@...wei.com> Subject: Re: [PATCH 12/32] cfg80211: Use mem_to_flex_dup() with struct cfg80211_bss_ies On Wed, May 04, 2022 at 09:28:46AM +0200, Johannes Berg wrote: > On Tue, 2022-05-03 at 18:44 -0700, Kees Cook wrote: > > > > @@ -2277,7 +2274,7 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy, > > size_t ielen = len - offsetof(struct ieee80211_mgmt, > > u.probe_resp.variable); > > size_t new_ie_len; > > - struct cfg80211_bss_ies *new_ies; > > + struct cfg80211_bss_ies *new_ies = NULL; > > const struct cfg80211_bss_ies *old; > > u8 cpy_len; > > > > @@ -2314,8 +2311,7 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy, > > if (!new_ie) > > return; > > > > - new_ies = kzalloc(sizeof(*new_ies) + new_ie_len, GFP_ATOMIC); > > - if (!new_ies) > > + if (mem_to_flex_dup(&new_ies, new_ie, new_ie_len, GFP_ATOMIC)) > > goto out_free; > > > > pos = new_ie; > > @@ -2333,10 +2329,8 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy, > > memcpy(pos, mbssid + cpy_len, ((ie + ielen) - (mbssid + cpy_len))); > > > > /* update ie */ > > - new_ies->len = new_ie_len; > > new_ies->tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp); > > new_ies->from_beacon = ieee80211_is_beacon(mgmt->frame_control); > > - memcpy(new_ies->data, new_ie, new_ie_len); > > This introduces a bug, "new_ie" is modified between the kzalloc() and > the memcpy(), but you've moved the memcpy() into the allocation. In > fact, new_ie is completely freshly kzalloc()'ed at this point. So you > need to change the ordering here, but since new_ie is freed pretty much > immediately, we can probably just build the stuff directly inside > new_ies->data, though then of course we cannot use your helper anymore? Eek, yes, thanks. My attempt to locate the alloc/memcpy pattern failed to take into account anything touch the source between alloc and memcpy. I'll double check the other examples. -Kees -- Kees Cook
Powered by blists - more mailing lists