Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp566240ybz; Wed, 22 Apr 2020 03:52:06 -0700 (PDT) X-Google-Smtp-Source: APiQypJsL1b1RPUyZf7sSW6YhJdD08yrvjZANphsJrqP3Imj6U7UQx9kR/yPQNX6h01DFncp4RJc X-Received: by 2002:a17:906:348d:: with SMTP id g13mr25372691ejb.374.1587552725854; Wed, 22 Apr 2020 03:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587552725; cv=none; d=google.com; s=arc-20160816; b=NcRQn35yMhe+aNOYhasdE0xas6zGD4ivfW2tKnnmie0lLS5EsYtoSlktrhLNAEC597 fDbcYn5l6AbSHuMtt6spYpQn977FGzb5edzWRmCQnajP5fQdH5bRWEcPhTk8IRHfkclY sQ2+fXxFiYvP3WBYeTxDOXPJueKLzBSRNzesGoKbBr5YRC1I5gU1MKWqaqNZxWCV9RsE nOTzwCCA4y+4i8fl066OM/49+eL4w/lKnn2Q6vkdmvOrLFRZjfVZAJrC9PVJ/7G4Scmx N+ln9gd0+OoyaOlv2XCnmwiRGPlr4qLup4Os1XL9ci0NKFOxSjN8JoBfnWKHoCSVSB9A RpOg== 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=RDR4LQFTXwUQrg862pzF3+jLr5olSzvGm/0XSp6FPRI=; b=T1ir2BFeL9CYwtmJbX3HjMyf1NEw6vig9ruPutgqS6SiSeEbBcU7g7i9juSUZ7c7bR EB32jCqHbffqljRnk4pUB6KAHlTgC51xIHRuIRS7cINr6XuWuhLkhsgD/h7UNcsmRW4c dYry+qlJpGb6ACmYpy7cSsCvXEUTPwnL37uzsYce5saN9v3h3EfXNrW7iQHPSd2DOiFR a+b+emjwNsprcTkwSFoIPo9isXZFKcZ0Vdfwl7cDPGJTvwBgehmkMN6R2febmtfp90I9 /EfFLsJomc0wzFBGVDdubAj0Ba9mNlis2sGXgWe+q5Pb776MN5WUGIt5+24buHG3yNY1 SNbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M89UoZFS; 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 e25si3295253edy.368.2020.04.22.03.51.43; Wed, 22 Apr 2020 03:52:05 -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=M89UoZFS; 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 S1732130AbgDVKtt (ORCPT + 99 others); Wed, 22 Apr 2020 06:49:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:46524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729397AbgDVKNB (ORCPT ); Wed, 22 Apr 2020 06:13: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 C218E2077D; Wed, 22 Apr 2020 10:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550381; bh=5NMuyZWCmZliclrYSh0KvOo0b4ZlLH5yjLm2O9vAJtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M89UoZFSAw8TUlBcV4WmEXNM006fTbFfdp+jbQGEzUkkoAnj45VIGubgHSzo9xKkN +fdtIVl88br9+Gmdm3WFhl8rlxzfzPbJ4UnBbyd1UysPIGb2SPOWqpHf5cBTbjv6VC UlDYdXr+ngl9lN2n1LIlC4vN7mqSOHOZzEdGAe1c= 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.14 123/199] mac80211_hwsim: Use kstrndup() in place of kasprintf() Date: Wed, 22 Apr 2020 11:57:29 +0200 Message-Id: <20200422095109.817494465@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@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 @@ -3134,9 +3134,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; @@ -3175,9 +3175,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