Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5441225rdb; Wed, 13 Dec 2023 08:43:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFB8+p9GlVXP9QXcuPw2dYHCZfCqCy/GLcjXWYoXc3YW+UbXBNDkq6SlicSIVTTnz+DiOB X-Received: by 2002:a17:90a:9742:b0:28a:b7d3:8b23 with SMTP id i2-20020a17090a974200b0028ab7d38b23mr1809383pjw.66.1702485798850; Wed, 13 Dec 2023 08:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702485798; cv=none; d=google.com; s=arc-20160816; b=Ek5DZMPkHtGfftWJqf2BjiHvwMc1vuzyHaZ6xlvEtIKJ0TN9J3ocFU8knIJANB3x5/ m+ZjYWPjQq1jHV3tOVo/Z6eNpD6i7EKpNE+uDAgJ9zIwIsV4sqQxlTCQxZbtd36QHI/s cdFZAXWshUMBA1W6T7UD2UbBWypeYdKS9N/WgUsqeCoTfDXP163D2WG6/V1cvDAKrhu+ z5ew4RhvcQmxS5QY6UPHNp77x+OQVyskliPq0kITMjs956ZV58U/aEe4lxV4WAoIIhaR xH9YjfyF2NeI/FZfrQK1/W91KWGog+cKmsWZpDxyW0ofD4oi3jgsRFY9gaahMaTGKBp9 1F8Q== 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=arETo2d/neIN7ROugis+TK3MIl4KXrv7yqsf4CWk2A0=; fh=V/JxxWZ3B+lpMBonvvHXc+bC0OTw834jzVqzprIXmGk=; b=WqZThtVerkkf/kS8blLaVb5UlgrRRWXwOcMS0nFE4qQiWJd1vIgREKSWvHHOjj6FZF XFSuWRkB/x+AsTog06dvy9E8yIkM0DrQJL00xuFDj+2aOHLVd85M0KEp/bxDh7p06jtH Vpph9ytPvCGMiNZFLHAEvjv25pLHrvNwhGmP7BBhqgJKmQTqs6yFxPTUbzGny7hop4k8 APA6YhEMP/LtvGZh24yneT5VmJaY0N2MXXxL9BERX6kqaTRpnQUOYdUDnxZvkwg1Ci34 ym4jLKqubuib2XF6ifqKNVALtXAhtkg3SdFqsAiJLqXfocNRPZIISz9wWt8tmCbq9TkQ eQrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bTqHvry3; 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 kb4-20020a17090ae7c400b002871b0b4a11si10035036pjb.61.2023.12.13.08.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:43:18 -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=bTqHvry3; 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 AB76D802FD1D; Wed, 13 Dec 2023 08:43:16 -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 S235186AbjLMQnE (ORCPT + 99 others); Wed, 13 Dec 2023 11:43:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235169AbjLMQm5 (ORCPT ); Wed, 13 Dec 2023 11:42:57 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68B11B9 for ; Wed, 13 Dec 2023 08:43:03 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54559C433C8; Wed, 13 Dec 2023 16:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702485783; bh=O6zPhvOuiRaMjZO2N7+0OTpsYUd4lm9ZY2n6Y+b+qeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bTqHvry36GwQ2JC5GUEHK2OZj84VP8H5phOup1YRj0QFGrDNCoBXjQXSWGFMqTY0B SQymbQsSGp50F/KU/lWWhLi0U2e0DNozV3AWJ+9d3fuAF91aquJHahP80iqWziuFju hkjOv4iVYP70IxzU9YbZcmwbm8mTOTwYXC4MgQvLeq157b9PoYT2CGZyhNfAZnNZTO V+RrnfSIDC2f9xXxwuE/mK1YOLsVPywIRokO1ioLrD+PmjQIsj8BJ+Dba2RrxVcJlG CuGYuXQ832/9hEQcuiLgu/CmE8Wg9MoBvTeSZeBBADWWXAq10oQlK8ljIoBN9O7oC2 Q/UDcpIbS5EvQ== From: Lee Jones To: lee@kernel.org, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, James Gruber , Yadwinder Singh , Jaswinder Singh , Ruslan Bilovol Subject: [PATCH 03/12] usb: gadget: f_uac2: Replace snprintf() with the safer scnprintf() variant Date: Wed, 13 Dec 2023 16:42:32 +0000 Message-ID: <20231213164246.1021885-4-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:16 -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: James Gruber Cc: Yadwinder Singh Cc: Jaswinder Singh Cc: Ruslan Bilovol Signed-off-by: Lee Jones --- drivers/usb/gadget/function/f_uac2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c index f9a0f07a7476b..383f6854cfec5 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -2045,7 +2045,7 @@ static ssize_t f_uac2_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; \ @@ -2063,7 +2063,7 @@ static ssize_t f_uac2_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: \ @@ -2187,7 +2187,7 @@ static struct usb_function_instance *afunc_alloc_inst(void) opts->req_number = UAC2_DEF_REQ_NUM; opts->fb_max = FBACK_FAST_MAX; - snprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink"); + scnprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink"); opts->p_terminal_type = UAC2_DEF_P_TERM_TYPE; opts->c_terminal_type = UAC2_DEF_C_TERM_TYPE; -- 2.43.0.472.g3155946c3a-goog