Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5441169rdb; Wed, 13 Dec 2023 08:43:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdfPWbRwwufiTb8brQP8wqHH3/IZ0TmgKtFYHVoT5qAqG0pjtEG5drZIS50VLl8pCO+gQ0 X-Received: by 2002:a17:902:f550:b0:1cf:e19e:2509 with SMTP id h16-20020a170902f55000b001cfe19e2509mr9774897plf.25.1702485793484; Wed, 13 Dec 2023 08:43:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702485793; cv=none; d=google.com; s=arc-20160816; b=GKMPePceHC1x2FKSKcaLGmHDajHd8Uv/oqjBCRB9GOAhxpQ7838pcmj6QtBXs5wCIN PdtwCS6MtEBBQFTie/mkyfHxbMnnQ2FlXRLmYpPAMtaCiBxiqusi7BIKumIyjx7guvua +vx+tmgZvsHatKwEEobI8FeHy5QsSY3wQlaog7gce3PWXwRdctWPs4jD5fgeKIHgtv/m k8rkf76UDkH/5K6wMqupYXFfkHsPwm3Qs9esD/w1/jgu4AZw1OZsqXU4gvG7PhNGM2cH l4sxEH200eR04igfWmMp9KmmPqbhLyEhAkteqYk4yI53r6EYnJ45FfN18aA56VKFdks0 mmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0Wa1fe6MisKtrfuo0Zt0sgqVGHcV1Xj8oW5Vjf+TQp8=; fh=pcgspRob2ZqfK/9ATtDiUyv6mPNLNO0oJ3kqE13eAaI=; b=F+e4ExpLGdUX64cVkbsykQ9m78OBHsH2sT6z00jEUxkRvbc9xyPpOWzH+SaCBgmtCn 1OOkFus0s647Oo+jP3q9pK++vfbbW3mnjKeccEVpluE3s47YtYb25vFShwQ4aWEl3LpX Olt4JyFJx0hdaOwvYs1vnNoZ9A0TN9Gz9zHoZPGx8mo46BPZYhfydpL+hf+jgP6Lj4QN aCJPGjwKx/dEbJ8Z+n5tvFx91eIuSuoi77JKlVRmSErG26i5f+dcwR1RdbQEAtDXF5id mRpAwxw2+lYOqrTPJjUhH7yb3a41qVlod0IMxEGWlimhNWP2g1q+5TZKtm1pE3GY4/uc 586w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oAG9v5+t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b13-20020a170902d50d00b001d0b5aa3000si10022316plg.456.2023.12.13.08.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:43:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oAG9v5+t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9E3BA803028A; Wed, 13 Dec 2023 08:43:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377387AbjLMQm5 (ORCPT + 99 others); Wed, 13 Dec 2023 11:42:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232912AbjLMQmy (ORCPT ); Wed, 13 Dec 2023 11:42:54 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 390DAAC for ; Wed, 13 Dec 2023 08:43:01 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 544A4C433CA; Wed, 13 Dec 2023 16:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702485780; bh=KSAg8fBYTK/g8UcM2sFdqwu8/yDHIW+WrzcjHTdiJFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oAG9v5+tPvaDHtFMQw+V4isvoCeKyHr0+26UlNATao/l4R2pCjfcNwXwwxBi+9rMI rT9pWiqzv1QXzOuGBrRe77E3PB2kdxSIdycKipspgwuoaSIkZakjZ1oLcowdUab0Ex eYiLRyq1hwbTDL/oC55Mb9NYFcUkfwtmDq0uYb1akYQmugbBJwGfd9ExClKgns9JsB su/WftgG+nDCIMTf+vs9MYqVA1VIjFG/bwbMbldosdZvqIt7/ZGJhKlthn9dbGBnn5 WeOwx9Tc8B+3fu5LhgvX5xxs5azFwI29T3ovol7yOpAQobyetzTEbB9ZvOfVIanxi/ o3akhp8l1F81Q== From: Lee Jones To: lee@kernel.org, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ruslan Bilovol , Julian Scheel , Bryan Wu Subject: [PATCH 02/12] usb: gadget: f_uac1: Replace snprintf() with the safer scnprintf() variant Date: Wed, 13 Dec 2023 16:42:31 +0000 Message-ID: <20231213164246.1021885-3-lee@kernel.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog In-Reply-To: <20231213164246.1021885-1-lee@kernel.org> References: <20231213164246.1021885-1-lee@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 08:43:11 -0800 (PST) There is a general misunderstanding amongst engineers that {v}snprintf() returns the length of the data *actually* encoded into the destination array. However, as per the C99 standard {v}snprintf() really returns the length of the data that *would have been* written if there were enough space for it. This misunderstanding has led to buffer-overruns in the past. It's generally considered safer to use the {v}scnprintf() variants in their place (or even sprintf() in simple cases). So let's do that. Link: https://lwn.net/Articles/69419/ Link: https://github.com/KSPP/linux/issues/105 Cc: Ruslan Bilovol Cc: Julian Scheel Cc: Bryan Wu Signed-off-by: Lee Jones --- drivers/usb/gadget/function/f_uac1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c index 6f0e1d803dc24..998e2331effb0 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -1561,7 +1561,7 @@ static ssize_t f_uac1_opts_##name##_show(struct config_item *item, \ int result; \ \ mutex_lock(&opts->lock); \ - result = snprintf(page, sizeof(opts->name), "%s", opts->name); \ + result = scnprintf(page, sizeof(opts->name), "%s", opts->name); \ mutex_unlock(&opts->lock); \ \ return result; \ @@ -1579,7 +1579,7 @@ static ssize_t f_uac1_opts_##name##_store(struct config_item *item, \ goto end; \ } \ \ - ret = snprintf(opts->name, min(sizeof(opts->name), len), \ + ret = scnprintf(opts->name, min(sizeof(opts->name), len), \ "%s", page); \ \ end: \ @@ -1685,7 +1685,7 @@ static struct usb_function_instance *f_audio_alloc_inst(void) opts->req_number = UAC1_DEF_REQ_NUM; - snprintf(opts->function_name, sizeof(opts->function_name), "AC Interface"); + scnprintf(opts->function_name, sizeof(opts->function_name), "AC Interface"); return &opts->func_inst; } -- 2.43.0.472.g3155946c3a-goog