From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9FFF3C77B73 for ; Tue, 23 May 2023 02:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=yYGSw0Hf2N56ZnlBHt8dHH5DSDItXTLpcP0qvLtijZQ=; b=jbOwET0KuqOFVh 1PoW2M3NVQGGxQ/6ciJyynPrGZjcW1b73dEIsrvBVAF2wkoYNFxu2pFYVWWCc/i0aU9r6gX735+DY kc30ic8tg5qzgIDbVx/i5kiz4e8sHiHiqIVSqr/B0E8wPomGTt9xi65j4UJSm6guQTP0viG98CCs4 G2uOFn21oJY41FHrghoV4s/OnvGogcKBInjganslrBzQR1a3y9Wz+GG/0OsR7v8c2C4r/NhMpPfYs xQ2yJuKOaaQCfqBloUU1hgW1HKie1VGItQZeWIer0eTmZWVPSfAzRYFklMpweNn2WiT3QOmJzyC9f 3Gn+RwefqgBiYvpCSGMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1HXl-008eqO-2L; Tue, 23 May 2023 02:14:33 +0000 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1HXi-008epF-1T for linux-arm-kernel@lists.infradead.org; Tue, 23 May 2023 02:14:31 +0000 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-33393c4c23dso729135ab.0 for ; Mon, 22 May 2023 19:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684808068; x=1687400068; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zX10SJBU8S1HDBYkbi8trIiB7376uD4rHt1agT0RgVE=; b=OaujpSZZUqwVOx9NEQ6g6toA8bjHdiLSGCHF/k5eKXl3ABo1UGNtVSzhTAX0SAhrbE cgx3x15bwXRGHk0+mEh2cffCJ3is4InYof0oCRfm9gT0XYCNJhUQfjzpIy2jthkLRpWM eciWFP26qbGuLXO1Uf8zUXuD7HRpsvF5evYPF53lpz4UerC6UOC1F9lTMdeaI5n+EyjI v9sQUBd0qgmEdzEd6Mkc6G0G9WXl0LXrI9LSILXFeM7ET6fhdiX33OYpZ4kZlp1IQ5ht /oyvczEGS9vnKPLX8VcTgthDs3kdmKuTyRuPnCsCfTrKVKndpPrAS2GOUJHqCQig1F8k QFFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684808068; x=1687400068; 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=zX10SJBU8S1HDBYkbi8trIiB7376uD4rHt1agT0RgVE=; b=J1DB1tpf9pH6V8bveTTMirgxQfuizfn8f7OcOuY8MHeUYlulisM2qCgByAq5gquhKa UIbe+wsJHoMqnHAiHQOEQ8FHW4nRXvS1XaS4pxXN/G1f1yGpfKRVzl2JgYgjYvtcGkUN v2/QH989bs2U7d/tiuhBsjswiFyeFmGd6DRBM384RCO0WpKsArzX3JG8hKhsScHNo6x+ VU+hp7AmxSQ55+EQqC2EaqchY3bcBVNfdTeq49MiCDEJ/xS/GaNqQeFcz7RMrcEWG6Y/ SUghSmn0l26eABh5zWBnuXeze2y553JLVhbr6dplB8e4/dwUAdiddPMpL2V1OeHQNa2W 3imQ== X-Gm-Message-State: AC+VfDzgacCx7E63cCGGXEm7KoiuEHD689nkREo9HtIAFqf/rU+q0Dnh YR5TacR5mVGEW8vF3ueXmO0= X-Google-Smtp-Source: ACHHUZ5F/Ce0ACQDapyA4JTnP2JZCUo2WThK1XKG2+ZKLbNVrxkTbmV0t/7CPbKthDMx/RVENWD5nQ== X-Received: by 2002:a92:de46:0:b0:335:1ed:359b with SMTP id e6-20020a92de46000000b0033501ed359bmr8482325ilr.15.1684808068359; Mon, 22 May 2023 19:14:28 -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 i1-20020a056638380100b00418647d4279sm2223488jav.69.2023.05.22.19.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 19:14:27 -0700 (PDT) From: Azeem Shaikh To: Qiang Zhao Cc: linux-hardening@vger.kernel.org, Azeem Shaikh , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Li Yang , linux-arm-kernel@lists.infradead.org Subject: [PATCH] soc: fsl: qe: Replace all non-returning strlcpy with strscpy Date: Tue, 23 May 2023 02:14:25 +0000 Message-ID: <20230523021425.2406309-1-azeemshaikh38@gmail.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_191430_497187_930C1A59 X-CRM114-Status: GOOD ( 12.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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(). 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 --- drivers/soc/fsl/qe/qe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c index b3c226eb5292..58746e570d14 100644 --- a/drivers/soc/fsl/qe/qe.c +++ b/drivers/soc/fsl/qe/qe.c @@ -524,7 +524,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) * saved microcode information and put in the new. */ memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); - strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id)); + strscpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id)); qe_firmware_info.extended_modes = be64_to_cpu(firmware->extended_modes); memcpy(qe_firmware_info.vtraps, firmware->vtraps, sizeof(firmware->vtraps)); @@ -599,7 +599,7 @@ struct qe_firmware_info *qe_get_firmware_info(void) /* Copy the data into qe_firmware_info*/ sprop = of_get_property(fw, "id", NULL); if (sprop) - strlcpy(qe_firmware_info.id, sprop, + strscpy(qe_firmware_info.id, sprop, sizeof(qe_firmware_info.id)); of_property_read_u64(fw, "extended-modes", _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel