From patchwork Mon Jul 10 01:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azeem Shaikh X-Patchwork-Id: 13306140 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3AF5EB64DD for ; Mon, 10 Jul 2023 01:18:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A3CA6B0072; Sun, 9 Jul 2023 21:18:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2548D6B0074; Sun, 9 Jul 2023 21:18:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11C8F6B0075; Sun, 9 Jul 2023 21:18:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F2F316B0072 for ; Sun, 9 Jul 2023 21:18:02 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 94435160255 for ; Mon, 10 Jul 2023 01:18:02 +0000 (UTC) X-FDA: 80993940804.12.63A8460 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf11.hostedemail.com (Postfix) with ESMTP id D1FBD4000A for ; Mon, 10 Jul 2023 01:18:00 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="amMAIt/t"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of azeemshaikh38@gmail.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=azeemshaikh38@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688951880; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=Z39fKcUZ3p7FqsICJneeQrJdxjKRWVhH52o8nOiwBmc=; b=1uGuXW41dph+weR247J/rV0zfkAQzy/tow19J9J31wK9ykbQQ7tm5lErnvaLXOryTGAnPt b/0u/Ts2wdV7VJufwx7MF5h1cYrCvBuSpB/4yMH2NyAIdvx1BoZPGygMW2gnZQLyb7XZCS pMsVcU4Dwccz30mbWbX5vumqyZwp6HQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="amMAIt/t"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of azeemshaikh38@gmail.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=azeemshaikh38@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688951880; a=rsa-sha256; cv=none; b=jtIM3TiH8Rys0ZjGo517/pbp5GAHS3Osam9ixJbuZWPm2GGQ7G3JXogRinxhPZ+OkT8Cpa bq/Vb6vwiepLWqmb4KjA2LVmKsEBBIw/QAXlrxkM71Hi8Hm+qoxEQdp4sP03LZ8glVbPEq VFomAlKfOaWtlW+HT8MJA+SLBk50ErE= Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-78363cc070aso193762939f.1 for ; Sun, 09 Jul 2023 18:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688951880; x=1691543880; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Z39fKcUZ3p7FqsICJneeQrJdxjKRWVhH52o8nOiwBmc=; b=amMAIt/tzCRrvnPhWSS3PzD56mlvGeyo5GpP9ja1gFd3LRhRqME48VZDOQlxCuTn+M TPGFQHwXMbJHl22cYSApT5gscedlbg9h/WAeM72tAeDnnFg+q2/wDOstmSnG/8Fx/uPi 4tVee6NnJGaEv/mF51DvHR0mwcsip6f9KG7hF1kfwzSbsMIY02rLB2pX6cn5TZ2jCoc8 KbHOESiLjv0/QZFqbISEZJBWUnDRu48mBTUXD4wQG6d2XzNQwCjgw2VoyQybGXEiQL2h ViY00RQ/Da/0awy/gW6GdIcg+QIDBFp8Cy2mu84dQkWHAM/3nybgBEc66octnenKxsO6 GJtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688951880; x=1691543880; 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=Z39fKcUZ3p7FqsICJneeQrJdxjKRWVhH52o8nOiwBmc=; b=eSopV0X0AwM5mbVQka/61mm7Xu1J5AQ2HDAKvEYD5e7+TOfSMSLr17IPcwFO/5FQjO mYTmSRORhzxRHl1VToKFzhCFBDVO3PLtopMecxO/rmdnswwQIuX0rGTba/nuW3pXFzu1 0ZeQ9FC4u57ryM5DqMpCvIPco1oh9OoXfj1vwG8PHLv5OiFy7hf79X27mSTJ/AJcx1DD s4eTh/gTvnhJI7zlCsbM/HvY62H6tRXbr+fV/kCkxziZPP57q1H3x3MftIok2HqsbZxt JsmV5f6Lhbslnh8i5RVTSuzVxSquXEH3UzFUtdRO6+4KRvGdoydPFhjZV1k0aE5iCQnC mMsw== X-Gm-Message-State: ABy/qLaeFmreS6OsqUnPcD42nc7Zo8YlMXnWL/VwVfSB7K+oDcRZcYbJ d53oZWwWVEss8IAgN1qyo38= X-Google-Smtp-Source: APBJJlHtL8raLHVkNlBEDHdfjSGTMCIMX/n3Ax8OS0SP4nQMawtvLiMZ3XUzbhsR8yxbHo54KUT/zA== X-Received: by 2002:a6b:5916:0:b0:787:169a:927 with SMTP id n22-20020a6b5916000000b00787169a0927mr630834iob.20.1688951879821; Sun, 09 Jul 2023 18:17:59 -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 j27-20020a02cb1b000000b0042b6a760c31sm3068714jap.28.2023.07.09.18.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 18:17:59 -0700 (PDT) From: Azeem Shaikh To: Andrew Morton Cc: linux-hardening@vger.kernel.org, Azeem Shaikh , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Kees Cook Subject: [PATCH] acct: Replace all non-returning strlcpy with strscpy Date: Mon, 10 Jul 2023 01:17:48 +0000 Message-ID: <20230710011748.3538624-1-azeemshaikh38@gmail.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog MIME-Version: 1.0 X-Rspamd-Queue-Id: D1FBD4000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 87fo39tqfnj8i7cqryzo8pnimarmkzuy X-HE-Tag: 1688951880-937827 X-HE-Meta: U2FsdGVkX1+ebUXOm47awVc1qmv71WPV/NqUSTyCZADIU/QmFqP6k8IM/XHm9o+3e0Z4Pdx3zVVmVTu4By+G7x6WMei/D8n1EKVjGpQNvy0hxpzuDGrn6oKHtGj//uNVEwjOCEf1tHU11c4hTh9cDFdK6WewQl2wEJRgyfb3twAleUGxIHDhAVKE46bPR312taFHyHlnllDXQC21Se8oU+Es0mslctXx44jcG46Tqbhw0kJBIr3tK8nUQzRG5NeTfanXkdB5hC6PG7Bzy+f3nPCjaKeNVS9CfR+iKvBkWgErd1K08tXvtEVG4jg4RFkjTrdEPVRhkhL1p+aQITZMR76KxMsWCtLzRw0E8jMUbklRtOeR2VqUQ8kasTn+RAWMtZVJoVXqv6by6kl11uM2Gp52CwvSNjTGzTMhV27vcAIp1pkFdKq/7e6Fo1CzlWq0YTIm4HksdzlJ4nMvbiJDoP1rgcHsyBWCtAine9EVhnCI3Xi2Lvz1WpqgOj5zIoKIekr4OjFi7lp7HH5HeAhFulSCV3ozR9K5QvPhOS+YgRwKa3z+rT6LqnpqDEOkqD5u/qZnU5Yt25m4c+ruNvrkzjZHOVKYIahLiXa/U+SvMZIShaWLBrjM4Lv46tJk51ldhxE14hx/ffKiL2M6qBUv+BLgN4rskw7Hu5ishuANt1fmYmishWw7ngEGhkOOTyFHi6l6VijhFYquM2NG6/YHm/oYJAWcq+JMiRgvAwwmwjjt6Wqok25VMU/Bmu/i+XAB7wJRgecOJ0HtYnaj/A7iI9/1+emaydBwNNSPIDh3cuNSBNEQLnGlK8F8KIF99Rz5XW4NyiIXNJDzaIaci8nfuo0yJ1uRcBa5+bv9k2PEd4zPrOCGG8T6yIhWz4BnF1P33THaeWLDXWpmQQ7lpeujeqP5qPlbG3e0Cf/GMa4DNGjhE5RLSMEfinyBjv/V0EAynvKW2BTRxo+93MYbLc/ q4crAm0f g4AYDUiTEDGbmmO7vkp5S6QOCkZ+h8UAgViJCuYsKvKKd7CMamgrg6ySdXwIVSDhAwfTYlgLdnpG/Chm/dpz3+qeX6AHtHuQYoaVrx/JfGJG2qvPYBv7OPk02CCWGyDWaoFcKyFZSHhJ4B+sy0DCLP+Jjio8oGO+toeLOaahG+Dl1z2sx1TQeg0tMH2P21Wkavzdn3gklhXV6b3YiMD/CIRkswsvO62izCExWGBHk98FufujadSpfcrhqiCk2ImpKlL16hblr5hVbRVDkupz7AjVeAH/doGKglkinOc7KmYkBllTx4izV263Kyv7xgdMlRCLWtiG2g4zR7OJyEQa+tNo6PFySrwiLafO9Klve7041ORhi9bA7f0DzuUzqXAw932IKgUIZhCPH1myuB2hsdSqWaJrJXXK0qpHBaHRaCt+lxzPzVaTlejt2KiNgX77hQPsu//z+WHov6TshNo/4efj4jmvcYTiRJ+5Yk30JPpRG3Oxf/fNTRY5l0JRrWQqb6LzM8dW2lKT7hzX/0wgm9SWi30xRy5dMTZAe X-Bogosity: Ham, tests=bogofilter, spamicity=0.018578, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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(). No return values were used, so direct replacement is safe. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [2] https://github.com/KSPP/linux/issues/89 Signed-off-by: Azeem Shaikh --- kernel/acct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.41.0.255.g8b1d071c50-goog diff --git a/kernel/acct.c b/kernel/acct.c index 010667ce6080..10f769e13f72 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -445,7 +445,7 @@ static void fill_ac(acct_t *ac) memset(ac, 0, sizeof(acct_t)); ac->ac_version = ACCT_VERSION | ACCT_BYTEORDER; - strlcpy(ac->ac_comm, current->comm, sizeof(ac->ac_comm)); + strscpy(ac->ac_comm, current->comm, sizeof(ac->ac_comm)); /* calculate run_time in nsec*/ run_time = ktime_get_ns();