Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp530609ybz; Wed, 22 Apr 2020 03:05:32 -0700 (PDT) X-Google-Smtp-Source: APiQypLr6kClSY2g4H7/eVLWH52Rdbpsua5I/Z3WvGB90njZJMUzpBegWzCIy9ADyTGNOp+/vC6K X-Received: by 2002:a17:906:7d7:: with SMTP id m23mr24301126ejc.154.1587549932368; Wed, 22 Apr 2020 03:05:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587549932; cv=none; d=google.com; s=arc-20160816; b=vfnFjo02ekFieN4kSYjA4b93wrmo1U3ZK5No5tGfBKYD2Bascb/78MggUj/QZmJERD KjZKYisrAxinMV9TtDAk03eAeclXCERCxwISpYRssCShqUN9TI5+YuhvcTKZj76eIgid 5wU47qJrsOLGULCkDsYRexkXPTa3d5sQlZOihUfdu4Z0XUbcQIRqcoSP6+GxYx25TIM3 GtkRv9xYZCvub9LruVAy+SUS18CKTA1znB/9zA+zrbj9dJ5aH1e442n4EZK+ePquCn0/ fPfKORXVdNQ3Gd5CY1QKHVDz3gtTaOzRimgcjYzKI3I1/pDsuY8Adlr39enKfpeMBU5i Ziaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pRyKLoi6c8iF2JMlTHyV+BmFUEe8tGnWip469TgRcPo=; b=eyTXfFhG3NLOZxLKN6Ob59OckJ64VUrrOk1vtHJkINRgPr/cTaAh7I5bgPpG7vRAj5 UbO3IXk/7zC8YIeK3rFs0dSSP+kv7GyQhQvP37i5Vk2gqROo4Ewx2nCRsoTG1EKxkA9h 0Zzt0rLdSxfQXIFr83DfwOmppb471s0gAJwX8yk/kvH7kOhoQ9o9w7cTWvlik2dbFSSb jpyqna0gFhAl5ZN7RCB0D8sCSL7uEpnfb3bakUfqmBwZrNbQ9ID2P5kLVebEwYyG+5hN mQwscZ4SfjABnurzvFjjk3WytDM0DXjDqce5GGNEvcafQEXp41RDxd730GRnSFsNU4G2 2W4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JJx6n6pM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k5si3426105ejj.441.2020.04.22.03.05.08; Wed, 22 Apr 2020 03:05:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JJx6n6pM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727102AbgDVKDD (ORCPT + 99 others); Wed, 22 Apr 2020 06:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:52454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725994AbgDVKDB (ORCPT ); Wed, 22 Apr 2020 06:03:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61D2320784; Wed, 22 Apr 2020 10:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549780; bh=6NosQb40PO6vCQGSmL9YTPubII9nqL0InDV35EY4yro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JJx6n6pMlQYeaMj/QBeaG2xEY6uf7aHtgr1D36QUmpQqmMW5n55GRAYCSDzHUEOQ1 infhcZBWlLpV8JFcmhuyWMtMnK9DBElf1oZL8ymsZMuprKdE51oJ3sGEnT8+wY1BDW ggFyJfj32O0VQPa2/1UO1iq7dMA1dHuXW5z35o90= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+6693adf1698864d21734@syzkaller.appspotmail.com, syzbot+a4aee3f42d7584d76761@syzkaller.appspotmail.com, stable@kernel.org, Tuomas Tynkkynen , Johannes Berg Subject: [PATCH 4.4 065/100] mac80211_hwsim: Use kstrndup() in place of kasprintf() Date: Wed, 22 Apr 2020 11:56:35 +0200 Message-Id: <20200422095034.740522811@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095022.476101261@linuxfoundation.org> References: <20200422095022.476101261@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tuomas Tynkkynen commit 7ea862048317aa76d0f22334202779a25530980c upstream. syzbot reports a warning: precision 33020 too large WARNING: CPU: 0 PID: 9618 at lib/vsprintf.c:2471 set_precision+0x150/0x180 lib/vsprintf.c:2471 vsnprintf+0xa7b/0x19a0 lib/vsprintf.c:2547 kvasprintf+0xb2/0x170 lib/kasprintf.c:22 kasprintf+0xbb/0xf0 lib/kasprintf.c:59 hwsim_del_radio_nl+0x63a/0x7e0 drivers/net/wireless/mac80211_hwsim.c:3625 genl_family_rcv_msg_doit net/netlink/genetlink.c:672 [inline] ... entry_SYSCALL_64_after_hwframe+0x49/0xbe Thus it seems that kasprintf() with "%.*s" format can not be used for duplicating a string with arbitrary length. Replace it with kstrndup(). Note that later this string is limited to NL80211_WIPHY_NAME_MAXLEN == 64, but the code is simpler this way. Reported-by: syzbot+6693adf1698864d21734@syzkaller.appspotmail.com Reported-by: syzbot+a4aee3f42d7584d76761@syzkaller.appspotmail.com Cc: stable@kernel.org Signed-off-by: Tuomas Tynkkynen Link: https://lore.kernel.org/r/20200410123257.14559-1-tuomas.tynkkynen@iki.fi [johannes: add note about length limit] Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/mac80211_hwsim.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2901,9 +2901,9 @@ static int hwsim_new_radio_nl(struct sk_ param.no_vif = true; if (info->attrs[HWSIM_ATTR_RADIO_NAME]) { - hwname = kasprintf(GFP_KERNEL, "%.*s", - nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]), - (char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME])); + hwname = kstrndup((char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]), + nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]), + GFP_KERNEL); if (!hwname) return -ENOMEM; param.hwname = hwname; @@ -2942,9 +2942,9 @@ static int hwsim_del_radio_nl(struct sk_ if (info->attrs[HWSIM_ATTR_RADIO_ID]) { idx = nla_get_u32(info->attrs[HWSIM_ATTR_RADIO_ID]); } else if (info->attrs[HWSIM_ATTR_RADIO_NAME]) { - hwname = kasprintf(GFP_KERNEL, "%.*s", - nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]), - (char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME])); + hwname = kstrndup((char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]), + nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]), + GFP_KERNEL); if (!hwname) return -ENOMEM; } else