From patchwork Tue Jun 13 00:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azeem Shaikh X-Patchwork-Id: 13277803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46DA4C7EE2F for ; Tue, 13 Jun 2023 00:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232125AbjFMAlD (ORCPT ); Mon, 12 Jun 2023 20:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230445AbjFMAlC (ORCPT ); Mon, 12 Jun 2023 20:41:02 -0400 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 194C818C; Mon, 12 Jun 2023 17:41:01 -0700 (PDT) Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-777b0cae9ecso313503839f.2; Mon, 12 Jun 2023 17:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686616860; x=1689208860; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2bxtso/h5hHMDA1OhTIwAdiVlb8X0frXvIU/x+6pApk=; b=J+yegLGQKyAIRViaiGY3XRX5DQMztkZdRhKVfuXd8sNk++I6tfM74xuZjf8cvuJc/f nA34+i+rxorP9WtjTAfkJh0/tgKxJ9Zg5IIwbT6zZSlgMpUmreOJVTZ0u+X+5qSnN6XK CNnPmEKtp22jsNOME8sbZQVm6N/Ajv7/Pq46xX4l+TwyNMdKAR1qbCiI+mxxx4OqNBVg TjDMcKXdMWhYZyPcfPeXRQGzH5KmP2bXpdn9TcB6ZmGOC+cWsmNYf44QMAqJDXeKwbLh GMvaYdZrmaH0l6rxqfY/JffS5VhymUjk7SzGX2nqSM1EUtx0qFbhhohymUBFGcCPF0Uu +iwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686616860; x=1689208860; 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=2bxtso/h5hHMDA1OhTIwAdiVlb8X0frXvIU/x+6pApk=; b=MEGwynq0EapjINOjwIt58dJ5QDE8+kvChg1RPgDkRR/FFb+bjjzNyGQBDm3ZC7OVTF +oLCXp+1KJ2tA6NU9sDnWyjxAf+wURLjOloVBYHdSKNtHkWR59zvdFw9SxQBNtX3G/Y1 LynAitO2wFOk1YofvAT+yOC12aIIIotoCVrT5Pi74Vl4wKLTjGtP3a11HKCLD2HVuwL4 iIxqzWN5ZdxD2MRfvMVeCDKwz2ZYIhs+pF1F/P5vrmKEZmLfvtsqnKGjWMRa96jjLO9M gZwnDytc/12+jSs8UAk+Ucg7hkAzl4vO35EWmZpHEOggaDhYw6KCNHO566V7aKURiQrc r2Sg== X-Gm-Message-State: AC+VfDxyTv0oNs2Ycq64PQMoIn/a4PJPJb5XZMEyj/B7URDUczNJ0US2 9orNRBera1Vciz1y7046tLW/xVTuXgxWXXRC X-Google-Smtp-Source: ACHHUZ4sJ9cNsW+X5gxKQUccWr3cOT8YCi8nQlEpEY2cteV+dfHrNgR3cl0sDXTQyZ7sFrHfBAGvMQ== X-Received: by 2002:a6b:e312:0:b0:774:9b75:b463 with SMTP id u18-20020a6be312000000b007749b75b463mr11558815ioc.7.1686616860370; Mon, 12 Jun 2023 17:41:00 -0700 (PDT) Received: from azeems-kspp.c.googlers.com.com (54.70.188.35.bc.googleusercontent.com. [35.188.70.54]) by smtp.gmail.com with ESMTPSA id k19-20020a02a713000000b0041ab38c1a4esm3119181jam.60.2023.06.12.17.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 17:40:59 -0700 (PDT) From: Azeem Shaikh To: Chuck Lever , Jeff Layton Cc: linux-hardening@vger.kernel.org, Azeem Shaikh , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Trond Myklebust , Anna Schumaker , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Subject: [PATCH] SUNRPC: Replace strlcpy with strscpy Date: Tue, 13 Jun 2023 00:40:54 +0000 Message-ID: <20230613004054.3539554-1-azeemshaikh38@gmail.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org 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]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy(). Direct replacement is safe here since the getter in kernel_params_ops handles -errorno return [3]. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [2] https://github.com/KSPP/linux/issues/89 [3] https://elixir.bootlin.com/linux/v6.4-rc6/source/include/linux/moduleparam.h#L52 Signed-off-by: Azeem Shaikh --- net/sunrpc/svc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index e6d4cec61e47..e5f379c4fdb3 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -109,13 +109,13 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp) switch (*ip) { case SVC_POOL_AUTO: - return strlcpy(buf, "auto\n", 20); + return strscpy(buf, "auto\n", 20); case SVC_POOL_GLOBAL: - return strlcpy(buf, "global\n", 20); + return strscpy(buf, "global\n", 20); case SVC_POOL_PERCPU: - return strlcpy(buf, "percpu\n", 20); + return strscpy(buf, "percpu\n", 20); case SVC_POOL_PERNODE: - return strlcpy(buf, "pernode\n", 20); + return strscpy(buf, "pernode\n", 20); default: return sprintf(buf, "%d\n", *ip); }