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: Tue, 3 May 2022 18:44:38 -0700 From: Kees Cook <keescook@...omium.org> To: "Gustavo A . R . Silva" <gustavoars@...nel.org> Cc: Kees Cook <keescook@...omium.org>, Chris Zankel <chris@...kel.net>, Max Filippov <jcmvbkbc@...il.com>, Rob Herring <robh+dt@...nel.org>, Frank Rowand <frowand.list@...il.com>, Guenter Roeck <linux@...ck-us.net>, linux-xtensa@...ux-xtensa.org, devicetree@...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>, 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>, "David S. Miller" <davem@...emloft.net>, Dennis Dalessandro <dennis.dalessandro@...nelisnetworks.com>, Dexuan Cui <decui@...rosoft.com>, Dmitry Kasatkin <dmitry.kasatkin@...il.com>, Eli Cohen <elic@...dia.com>, Eric Dumazet <edumazet@...gle.com>, Eric Paris <eparis@...isplace.org>, Eugeniu Rosca <erosca@...adit-jv.com>, Felipe Balbi <balbi@...nel.org>, Francis Laniel <laniel_francis@...vacyrequired.com>, Franky Lin <franky.lin@...adcom.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Gregory Greenman <gregory.greenman@...el.com>, Haiyang Zhang <haiyangz@...rosoft.com>, Hante Meuleman <hante.meuleman@...adcom.com>, Herbert Xu <herbert@...dor.apana.org.au>, Hulk Robot <hulkci@...wei.com>, Jakub Kicinski <kuba@...nel.org>, "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>, Johannes Berg <johannes.berg@...el.com>, Johannes Berg <johannes@...solutions.net>, 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-wireless@...r.kernel.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>, Mimi Zohar <zohar@...ux.ibm.com>, Muchun Song <songmuchun@...edance.com>, Nathan Chancellor <nathan@...nel.org>, netdev@...r.kernel.org, Nick Desaulniers <ndesaulniers@...gle.com>, Nuno Sá <nuno.sa@...log.com>, Paolo Abeni <pabeni@...hat.com>, Paul Moore <paul@...l-moore.com>, Rich Felker <dalias@...ifal.cx>, 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: [PATCH 29/32] xtensa: Use mem_to_flex_dup() with struct property As part of the work to perform bounds checking on all memcpy() uses, replace the open-coded a deserialization of bytes out of memory into a trailing flexible array by using a flex_array.h helper to perform the allocation, bounds checking, and copying. Cc: Chris Zankel <chris@...kel.net> Cc: Max Filippov <jcmvbkbc@...il.com> Cc: Rob Herring <robh+dt@...nel.org> Cc: Frank Rowand <frowand.list@...il.com> Cc: Guenter Roeck <linux@...ck-us.net> Cc: linux-xtensa@...ux-xtensa.org Cc: devicetree@...r.kernel.org Signed-off-by: Kees Cook <keescook@...omium.org> --- arch/xtensa/platforms/xtfpga/setup.c | 9 +++------ include/linux/of.h | 3 ++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c index 538e6748e85a..31c1fa4ba4ec 100644 --- a/arch/xtensa/platforms/xtfpga/setup.c +++ b/arch/xtensa/platforms/xtfpga/setup.c @@ -102,7 +102,7 @@ CLK_OF_DECLARE(xtfpga_clk, "cdns,xtfpga-clock", xtfpga_clk_setup); #define MAC_LEN 6 static void __init update_local_mac(struct device_node *node) { - struct property *newmac; + struct property *newmac = NULL; const u8* macaddr; int prop_len; @@ -110,19 +110,16 @@ static void __init update_local_mac(struct device_node *node) if (macaddr == NULL || prop_len != MAC_LEN) return; - newmac = kzalloc(sizeof(*newmac) + MAC_LEN, GFP_KERNEL); - if (newmac == NULL) + if (mem_to_flex_dup(&newmac, macaddr, MAC_LEN, GFP_KERNEL)) return; - newmac->value = newmac + 1; - newmac->length = MAC_LEN; + newmac->value = newmac->contents; newmac->name = kstrdup("local-mac-address", GFP_KERNEL); if (newmac->name == NULL) { kfree(newmac); return; } - memcpy(newmac->value, macaddr, MAC_LEN); ((u8*)newmac->value)[5] = (*(u32*)DIP_SWITCHES_VADDR) & 0x3f; of_update_property(node, newmac); } diff --git a/include/linux/of.h b/include/linux/of.h index 17741eee0ca4..efb0f419fd1f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -30,7 +30,7 @@ typedef u32 ihandle; struct property { char *name; - int length; + DECLARE_FLEX_ARRAY_ELEMENTS_COUNT(int, length); void *value; struct property *next; #if defined(CONFIG_OF_DYNAMIC) || defined(CONFIG_SPARC) @@ -42,6 +42,7 @@ struct property { #if defined(CONFIG_OF_KOBJ) struct bin_attribute attr; #endif + DECLARE_FLEX_ARRAY_ELEMENTS(u8, contents); }; #if defined(CONFIG_SPARC) -- 2.32.0
Powered by blists - more mailing lists