Message ID | 20231116192127.1558276-1-keescook@chromium.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 i16csp60877vqn; Thu, 16 Nov 2023 11:21:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyWdLT6FbXUgugeKiI28mSXeGXmSPTTrWtFHiYcdOCogu6SC0uzeJCdyg7t2k6uSwpvUnZ X-Received: by 2002:a05:6a20:daa0:b0:186:bd68:fa95 with SMTP id iy32-20020a056a20daa000b00186bd68fa95mr14078413pzb.22.1700162510930; Thu, 16 Nov 2023 11:21:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700162510; cv=none; d=google.com; s=arc-20160816; b=bc8e19r5RczdJkDqptQofinIXc6UDKqzQornCarW0tbBR4VVuou0eIH3zuCMvwyTXy k/2fBxiyJ4GPqb7yy7d6QOrEg7bnbTCMP879iigFsNqth5H/afbk7F+6cExExzTv/Hf+ bdVELXVYhDuo3iZ8RhiShifcVcJYIxkUgs6thW69IRW5oDVBiepf0iUPnvnti5y30KDD ZszrCmVCStR8Kd1SjCDfmZIBm3hgKtCL0g5oCg2+cYEnqpkWHjqXxVMEfuDIPhD+RzlX WdD8PnakxKhQ6aa/UURfmWcR6htIsJEsmK3cNh+ti+55XYW3azBM7FTtyu/+vaqN4q4p XF7g== 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=JcOGCvfEagiw1YdvVb5+RIJk8AKqAaDYL4V7FygIVew=; fh=2UkcmCitDDPaqUpeezN27ZwfvRRnYhnmpAhpB5pkYkQ=; b=GSJGgpOROenVUkvVGIcFMGP0h1gfM7QhUpiY0HJ2RrX4tvM5ScoOtToVv/yq69clEE MZtDI19e4FLr2WHSuMpSBL6gZk+XBUmtlalPv8J3kuXv7W+S2XIAC0JK8THRY0QHszEp ml9n9mvXus38yLzeFLaBVSQ9K0Aa6HcQ6pALeZw7cdzm7aVVt9sxyF9vQqAMFZXa6wBQ Ufi/EMitwFXIy81kEqcTbkhGSqRv9+v7eswSCWHKPsJGLT0fZu9TXg8U87WpHxgJMO8J lFqzCqafIdSbaljS7ZzCGkzwYAl/kbVjs3Dq94NW62j9C2nEZErnpiGj+2sPKpCIRHix 0J1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Obwa6NhB; 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=chromium.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id c9-20020a631c49000000b005acba4c9bf4si123712pgm.2.2023.11.16.11.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 11:21:50 -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=@chromium.org header.s=google header.b=Obwa6NhB; 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=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2F79181DE224; Thu, 16 Nov 2023 11:21:50 -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 S1345501AbjKPTVk (ORCPT <rfc822;jaysivo@gmail.com> + 30 others); Thu, 16 Nov 2023 14:21:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbjKPTVg (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 16 Nov 2023 14:21:36 -0500 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24D521A8 for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 11:21:30 -0800 (PST) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1cc3bb4c307so10978025ad.0 for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 11:21:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700162489; x=1700767289; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JcOGCvfEagiw1YdvVb5+RIJk8AKqAaDYL4V7FygIVew=; b=Obwa6NhB3UvqEPYIY/eSPoywDnIy6qI94KyzaKOwFxO0bvBS8qUe28NohbTj6++iDz kChhiWkx+A683O/yoCYMHL6z8K8RrRJIaBQfNOJOwI/njVXcAODwOCKfdy10liYXLQCN bQQPOxHFJ/Kzudt9tTrE6JIeD4Jlz/yny339c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700162489; x=1700767289; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JcOGCvfEagiw1YdvVb5+RIJk8AKqAaDYL4V7FygIVew=; b=UatWXE/ZElR4JPhykIaiUmZIMUryizO1M5KWwXTOEOo+8ZMoK33uBG8xpacaNqAWSi luQyJJ8ocK537Thc6ZvCLoTa8K8ZuQXeIAQ+hje5w1fU7jmdEOv464aGyjxXC3TD15Jm DFl3Sd30GwXZGq5IeqRL//EoSAXwvEo0kV16t39WJsc656CssM0gcESjgMVK55FWkdqD Kh5zunFUCoqad8VZGn72PCY5VJNmG6XrUZ6WpH3Ogg7Bterm+Rbccfp+UitY0A2waRiX vH3igZyOQ2TG/ulswzRD4uXWQ/jFM95FY9ws4D7O66T64HdXRyo8QBFUQ/y1UctTPMDs Se1Q== X-Gm-Message-State: AOJu0YyHIF/vZ0Ro+eWkMbm24wM2/9cFrJBrjTVtVhme7n+f4DBvoSee meNavyCqIXUMz1gmjNuKN9kacA== X-Received: by 2002:a17:902:eccb:b0:1cc:3c2f:9c41 with SMTP id a11-20020a170902eccb00b001cc3c2f9c41mr11600739plh.23.1700162489608; Thu, 16 Nov 2023 11:21:29 -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 c5-20020a170902c1c500b001c32fd9e412sm28083plc.58.2023.11.16.11.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 11:21:28 -0800 (PST) From: Kees Cook <keescook@chromium.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Kees Cook <keescook@chromium.org>, Tejun Heo <tj@kernel.org>, Azeem Shaikh <azeemshaikh38@gmail.com>, Zefan Li <lizefan.x@bytedance.com>, Johannes Weiner <hannes@cmpxchg.org>, Waiman Long <longman@redhat.com>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 1/3] kernfs: Convert kernfs_walk_ns() from strlcpy() to strscpy() Date: Thu, 16 Nov 2023 11:21:23 -0800 Message-Id: <20231116192127.1558276-1-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231116191718.work.246-kees@kernel.org> References: <20231116191718.work.246-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1547; i=keescook@chromium.org; h=from:subject; bh=RC/7LXkyyLguxbbh56shJCtsntlpj0v42+8lbCHyU+Q=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlVmu1a6YGdzhkpS/cBY9OTj5JYo8XAMY6N0Jto saH/INeq++JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZVZrtQAKCRCJcvTf3G3A JmvvD/4hr2r1X4hdNRSGjLQ0H9OzAANSFcbnzJfaOanKtWw5cPHnrunF87wYSMyErB4/oiEJRLs 0HkPFaj2BH5MXTVv4dNNPgNWv5sV7AbzxG+f3fdi3csPn3hTlnA4J8ugnwhU3piG8gYUOWP6vaT pf2p3JEknP9h4DK51GSgbULEBrBYo1PRWXKa2joQA3vkfWjunJoR0FEiNFlzm5LCYqb3YhBtws2 qofYsgxWF2wfkKO5nKlGyFyarUQfJ2RVLsIi+UMDpBVzO42U3VZyQlhkTcg7EkmOtudofwdBXK4 0+Zm3jPk2zNGJfle1nY4jU9/mDukzZNJUhKagSnXYbf5JjntQ7n4HGFwaX9TsjyVmzhTrQ7gdqH krL0I5ky99HtHXMTUGWqyOUxwp1/VVdvp1umcCodYwkiptU0kKhbx96z/sFfT293wXWmcJHrilQ QVO4JiJSrQalFRzNYTvKQA+liozKhtf+rCDc7PfrRykroARPwmlXWBN8MXyEHTG8usj0LM/5lqE TLTHGNwFkf2LPoPdSdt1FYYpM+d8aCyWbqWuAryypw63HLRYP6tMyXNhMc36X9s3wo4404dXooj /EGJXy98yYJx8ykG85Ru2S1uYthlhKQQ2MpUBixq+dLxTB6qtI9vJoywzOpi3tqIINg3BntSh2t jIEaboOkD87aMGQ== 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=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: <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:21:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782749605291311376 X-GMAIL-MSGID: 1782749605291311376 |
Series |
kernfs: Convert from strlcpy() to strscpy()
|
|
Commit Message
Kees Cook
Nov. 16, 2023, 7:21 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().
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: Tejun Heo <tj@kernel.org>
Cc: Azeem Shaikh <azeemshaikh38@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/kernfs/dir.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 8b2bd65d70e7..37353901ede1 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -850,16 +850,16 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent, const unsigned char *path, const void *ns) { - size_t len; + ssize_t len; char *p, *name; lockdep_assert_held_read(&kernfs_root(parent)->kernfs_rwsem); spin_lock_irq(&kernfs_pr_cont_lock); - len = strlcpy(kernfs_pr_cont_buf, path, sizeof(kernfs_pr_cont_buf)); + len = strscpy(kernfs_pr_cont_buf, path, sizeof(kernfs_pr_cont_buf)); - if (len >= sizeof(kernfs_pr_cont_buf)) { + if (len < 0) { spin_unlock_irq(&kernfs_pr_cont_lock); return NULL; }