Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3595808ybz; Mon, 20 Apr 2020 06:02:04 -0700 (PDT) X-Google-Smtp-Source: APiQypIVnhc+D2xJdJyZjOztmyJjf4EAvf9ZpIqxWsnJ37nAzZ9rMDeuxRL9XSMG5BUKIuXCeH4h X-Received: by 2002:a17:906:459:: with SMTP id e25mr16244988eja.379.1587387724641; Mon, 20 Apr 2020 06:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587387724; cv=none; d=google.com; s=arc-20160816; b=XRHASr3HlMZwofUvHIg0XW8FHbKAg43v4UWeAQ0/vuV4dsYPICDXOqz2HDvKz3KvUE RLCtVmPYMLoA/S574sycaTy4157Cpf3ZSffC8t5bYGGdDOzuot7VdTWy7AUbE6TJFDE8 phmurmeOtLU1VofJg2s6NrxZJuWzYF1egP66h8fb+whUyWYJW91T4Z8I6Cj/jk+frq3Z TOB6JbWKnroNYZqSOJ7Kv4QzPPuHEDfRWsgBAZ+pEbmNmiPKfIDU1Epw1pvb1EZn/wfG OyQ/MEvmsvx4ZGyR+8XXlA2KnA1JTtHIOC2LZIEn3ETM3m70ko390DQvBJMx4w0h4yXk TyLQ== 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=gQjiKrvCq/UDHKvogmFrDWEIt8DsZUNkPMMN4gj+X1E=; b=DCNUhCvJyho2EYVbUz85WpyqvT0b9/tt3XBWnR5Jn7jdqTlVwxb3ix13lek0N7LsM5 9ChHCG49tfbIHvcQSL84CvOLak1vD6LZOdQ0oplT4W7TulbQRMN2qtm6XDNHYpygkrsn Q3YD73tmiX+xiREsyVt7yN3Yr4VXeESoDVoPaCxZBcV/cT99I26hOOclnC6efum/jKcM N/GpS/3kGtujrDEuKJh2+YH/k5NkfgLqEsNXjMEukVekbIr1QVc2p0G5hI9sOTzBh9Uu xksNkj/HDjuQ4XvGCdYOEHrM/D85G8h8qk4FR9CTvvJKViu9KkgaVgungGKP8DGNuTOi JKRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M5zN2LDD; 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 m17si483395edf.454.2020.04.20.06.01.32; Mon, 20 Apr 2020 06:02:04 -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=M5zN2LDD; 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 S1728687AbgDTM7U (ORCPT + 99 others); Mon, 20 Apr 2020 08:59:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:34540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728078AbgDTMlr (ORCPT ); Mon, 20 Apr 2020 08:41:47 -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 EFDAD2070B; Mon, 20 Apr 2020 12:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386506; bh=WhMu6k3YzRYYu55dKp7nGrT7kR2HXHgEVPODScMIWZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5zN2LDDFJL6ZM7gsjA87wl+dZrlYcuSQRwGp9pSGNVnx+0mmQ9wU+edhuESIt7mM l/9pGOhvXklOyS3V4FKcX2IxITFvsD6jYZxwfyxLBPo3wbE0we+l8RkuXBpykKWZ2K kmNS9cEP+U+EFVna4ddDKVaajlCIsSRG/KLwwqtk= 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 5.5 51/65] mac80211_hwsim: Use kstrndup() in place of kasprintf() Date: Mon, 20 Apr 2020 14:38:55 +0200 Message-Id: <20200420121518.015027134@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@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 @@ -3600,9 +3600,9 @@ static int hwsim_new_radio_nl(struct sk_ } 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; @@ -3622,9 +3622,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