Message ID | 20231116191452.work.902-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp56924vqn; Thu, 16 Nov 2023 11:15:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHK6izqectpygZZEsc2kwWX8pOTE96VrcNnQ7is+QrQ1t4VkfJFgLfSLy8T/6N05Y8lSMiM X-Received: by 2002:a05:6a20:2618:b0:187:5302:4b2e with SMTP id i24-20020a056a20261800b0018753024b2emr5239249pze.41.1700162114713; Thu, 16 Nov 2023 11:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700162114; cv=none; d=google.com; s=arc-20160816; b=aVWzqjSdFQWuKhw3iIQrsF3ZrYvtLpkagjyR3+orSq37w2eEsZeva7EsPRNaksFtP2 osmyp/bsPH9kDe5jY0pFdxEt9SIF+bGC62xti6Jd3J78kDiPirSoC660yGNpHvyYXxr9 g/bJHDftljvySHoNtIHyJ+Ufa0rQmaOXz4YfS40FwtI1GAywdJHNPqbAEBaSbVJlyvK4 /Gkn32Zl693z1c/cRUA477Vq1HOHDmNKDJOPiKqq7oVVcmrgbKa5nvLsTKU3ElFN+hok DWFzNuk3n9+L9mf0nr8Lf962KNTqGLZtpdVX2OCPQNTv0ZVTaFK4SZozVLcmGpOTSo1P MHBw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=+ooyanxwFqzoCUAfMi/r6dZ9KYIj04ackpf2tMZ7gBc=; fh=nJA1Rp+2Ym9TtdsWLtghftGO3MA4rEe4+l0AyunuD7Q=; b=qNsrh8G3CJAVPQejSmT6FPg8Dj2IGjxjbpiHjF82jTZFWawTufcwQl8ZFho1nN+x3z KGFK3PMH/R9r1g/2ukLqwA3ajjrZiSt1ZyMxZmAG8QMYPIrh34kI5IyNkbd5L8UepKK/ arlw/yNCCW7SvLVmxHbqB1YU0L3OAfHbhmPK8j4GycarZbnqvSdcCj33zak9Duv9Me4x r+F+AQSrNx1XwnHjTBUG5e+F+naESujiGwTecXzbjVu59G/dDUWdZaoGjrfLVsplxzLD jkDq3Udtwd2FAh46R5M5Xto/btH85bp7btzbyhQzS6PzjQSlRW1Mm4j4sckcwz6YJrJd /3cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MYgweE7x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id pi3-20020a17090b1e4300b0027d04b581dcsi2808672pjb.72.2023.11.16.11.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 11:15:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MYgweE7x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 92CA681DD7F4; Thu, 16 Nov 2023 11:15:03 -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 S1345500AbjKPTO7 (ORCPT <rfc822;jaysivo@gmail.com> + 30 others); Thu, 16 Nov 2023 14:14:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345396AbjKPTO6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 16 Nov 2023 14:14:58 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C47A8D5C for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 11:14:54 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-282e3beb418so984986a91.0 for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 11:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700162094; x=1700766894; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+ooyanxwFqzoCUAfMi/r6dZ9KYIj04ackpf2tMZ7gBc=; b=MYgweE7xaJiMrldoUquE7MUmZvN7k1x6a/fq3BWiAgBQFPX0RfXEsaPiuL8k53TidJ 3FyIft4xcTxMJQIaErSX/O4pXHmPG40pT1BaQkP/roFbx5S8v6l8RWj3Wzg7T2ynL9wJ 8h8rYRtSEtJkxAgklnVBuVLTFGbRAhOnA1fUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700162094; x=1700766894; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+ooyanxwFqzoCUAfMi/r6dZ9KYIj04ackpf2tMZ7gBc=; b=vEmrN1mFlARHAa6WHmpHVLp/b2h1tsFoMHLMUm8WQfEecLlqJHwQ7d14EE6T1e51xZ IE+SlSytMlprYfnhdpBtyQKnUq/1uHa0hsIvreVGRAje5eRqfTdUNLbXRxZTY1Tp37Vx bzQcwIdOvx5wuqdavkzOyoHGstmY/Ay8W+cRN+yq9E2chAnykLNianT/vdiG12hvBNkX k1tTB2DSOMKHS7t8VVAE1I9TLapyJa7XF8pPvJ3QWCrCa1srUUjC4rxucC1IyU/67x4h Ws+LYCzM3QYP7IFh00ns/ukPiFFXsO0oCMAXFuYRNHud77f16An1LjcccNNPjEL6kUmk Xfjg== X-Gm-Message-State: AOJu0YyBfaz5sGcRt7v6MAoVNAf/dkDcRQNClHyNMojjZx/P1PtVofaP NLSRivfIO6p0JeCvveD8bXxMmw== X-Received: by 2002:a17:90b:3805:b0:27c:f845:3e3f with SMTP id mq5-20020a17090b380500b0027cf8453e3fmr18633338pjb.1.1700162094148; Thu, 16 Nov 2023 11:14:54 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id x23-20020a17090a789700b0027ce48022cbsm1864300pjk.14.2023.11.16.11.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 11:14:53 -0800 (PST) From: Kees Cook <keescook@chromium.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Kees Cook <keescook@chromium.org>, Will McVicker <willmcvicker@google.com>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, Peter Chen <peter.chen@nxp.com>, Davidlohr Bueso <dave@stgolabs.net>, Zhang Qilong <zhangqilong3@huawei.com>, Linyu Yuan <quic_linyyuan@quicinc.com>, John Keeping <john@keeping.me.uk>, Azeem Shaikh <azeemshaikh38@gmail.com>, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] usb: gadget: f_midi: Replace strlcpy() with strscpy() Date: Thu, 16 Nov 2023 11:14:52 -0800 Message-Id: <20231116191452.work.902-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1909; i=keescook@chromium.org; h=from:subject:message-id; bh=qZ5H5ERgauLMlg2cEGUYlQoQmkO6+yXxhj2mdEiuCF0=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlVmospmeMBspQEgM+FphUPl4B+bJ0qhQQHcykG D0lENa7gk+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZVZqLAAKCRCJcvTf3G3A Jj1MEACh6czqKJMgVJfwjpK8ekF4SaN8AfvkxnsbBSk+s9wKz0ZGrYqtXRRaGmDhBslxgwJ3lBJ l1GwT571IrkrIhNERZ2uKVsB0yT4sitzGfcf+41ABRrgN2twySqSxLz32ZGBF99FxQ1ulQw1u6j AREUq8v8jvXBdJzPHw8ULVWiZxhE3KPzPGcZUHUEK/bcUgi0LDlo5zXqkK0DonkjEfb/rgwjqcv GUc3ws9YqCT9/Nj4QN1ylP1knTd8RsQuL120nfhhDoMHOvVOyp1YeliC/2qt5xKX0HXrPlzgGPC NIv5G5sOV7Z9ycWhbT2hO6ZEd1nLI0vcdmKiiMQfnw6BoGstrC5olvFxR4ZJF0QXMTyDlXBeD8B jgZyCDP4L1MOQHm9dAVrUZhe9c+C4O+TxsEkNja+4Tfe4KDWGoxOHXZ4rg9zrS/qFNfHj0GS4bU m9vOdsJbaEr866nVCCN9qHxgZftc5vmVow8mukAO1dwL+A7cIaPerpyB7BQclc2qkoEIonXTDWm ZDCyngIMTYc415tE5vN05Ws8+stoAJ55oJwXGrqiQuU2jbKvf6EZGYkkPiRbG29uGYtPxKWQGDH YOK7UDQnOF9xcDHSdOxpSmx3cOYbSUuqxIkA94ljgDBZUEiv9c6ms9Sgv4X4O2WXki5lIKvA2cl pMTbiTs /prBprlQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable 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: <linux-kernel.vger.kernel.org> 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]); Thu, 16 Nov 2023 11:15:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782749189562993229 X-GMAIL-MSGID: 1782749189562993229 |
Series |
usb: gadget: f_midi: Replace strlcpy() with strscpy()
|
|
Commit Message
Kees Cook
Nov. 16, 2023, 7:14 p.m. UTC
strlcpy() reads the entire source buffer first. This read may exceed
the destination size limit. This is both inefficient and can lead
to linear read overflows if a source string is not NUL-terminated[1].
Additionally, it returns the size of the source string, not the
resulting size of the destination string. In an effort to remove strlcpy()
completely[2], replace strlcpy() here with strscpy().
In the unlikely (impossible?) case where opts->id was larger than
PAGE_SIZE, this will now correctly report truncation errors.
Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [1]
Link: https://github.com/KSPP/linux/issues/89 [2]
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Will McVicker <willmcvicker@google.com>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Peter Chen <peter.chen@nxp.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Zhang Qilong <zhangqilong3@huawei.com>
Cc: Linyu Yuan <quic_linyyuan@quicinc.com>
Cc: John Keeping <john@keeping.me.uk>
Cc: Azeem Shaikh <azeemshaikh38@gmail.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/usb/gadget/function/f_midi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 5335845d697b..20c6fbd94f32 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1177,11 +1177,11 @@ F_MIDI_OPT(out_ports, true, MAX_PORTS); static ssize_t f_midi_opts_id_show(struct config_item *item, char *page) { struct f_midi_opts *opts = to_f_midi_opts(item); - int result; + ssize_t result; mutex_lock(&opts->lock); if (opts->id) { - result = strlcpy(page, opts->id, PAGE_SIZE); + result = strscpy(page, opts->id, PAGE_SIZE); } else { page[0] = 0; result = 0;