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:17 -0700 From: Kees Cook <keescook@...omium.org> To: "Gustavo A . R . Silva" <gustavoars@...nel.org> Cc: Kees Cook <keescook@...omium.org>, Luca Coelho <luciano.coelho@...el.com>, Kalle Valo <kvalo@...nel.org>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Johannes Berg <johannes@...solutions.net>, Gregory Greenman <gregory.greenman@...el.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>, 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>, Johannes Berg <johannes.berg@...el.com>, John Keeping <john@...anate.com>, Juergen Gross <jgross@...e.com>, 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>, 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: [PATCH 08/32] iwlwifi: mvm: Use mem_to_flex_dup() with struct ieee80211_key_conf 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: Luca Coelho <luciano.coelho@...el.com> Cc: Kalle Valo <kvalo@...nel.org> Cc: "David S. Miller" <davem@...emloft.net> Cc: Jakub Kicinski <kuba@...nel.org> Cc: Paolo Abeni <pabeni@...hat.com> Cc: Johannes Berg <johannes@...solutions.net> Cc: Gregory Greenman <gregory.greenman@...el.com> Cc: Eric Dumazet <edumazet@...gle.com> Cc: linux-wireless@...r.kernel.org Cc: netdev@...r.kernel.org Signed-off-by: Kees Cook <keescook@...omium.org> --- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 ++------ include/net/mac80211.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index 406f0a50a5bf..23cade528dcf 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -4108,7 +4108,7 @@ int iwl_mvm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, int ret; u16 queue; struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); - struct ieee80211_key_conf *keyconf; + struct ieee80211_key_conf *keyconf = NULL; ret = iwl_mvm_allocate_int_sta(mvm, sta, 0, NL80211_IFTYPE_UNSPECIFIED, @@ -4122,15 +4122,11 @@ int iwl_mvm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, if (ret) goto out; - keyconf = kzalloc(sizeof(*keyconf) + key_len, GFP_KERNEL); - if (!keyconf) { + if (mem_to_flex_dup(&keyconf, key, key_len, GFP_KERNEL)) { ret = -ENOBUFS; goto out; } - keyconf->cipher = cipher; - memcpy(keyconf->key, key, key_len); - keyconf->keylen = key_len; ret = iwl_mvm_send_sta_key(mvm, sta->sta_id, keyconf, false, 0, NULL, 0, 0, true); diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 75880fc70700..4abe52963a96 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1890,8 +1890,8 @@ struct ieee80211_key_conf { u8 hw_key_idx; s8 keyidx; u16 flags; - u8 keylen; - u8 key[]; + DECLARE_FLEX_ARRAY_ELEMENTS_COUNT(u8, keylen); + DECLARE_FLEX_ARRAY_ELEMENTS(u8, key); }; #define IEEE80211_MAX_PN_LEN 16 -- 2.32.0
Powered by blists - more mailing lists