From patchwork Wed Sep 13 00:51:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 138667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp888752vqx; Tue, 12 Sep 2023 23:32:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFf4fyIkx3djq5u1aIbsFmt3/MnRatVnHT2fEm6toAre0Ip/zp06V2xz/hHQCG0shOPm6O+ X-Received: by 2002:a05:6a00:b8c:b0:68c:57c7:1eb0 with SMTP id g12-20020a056a000b8c00b0068c57c71eb0mr1925505pfj.11.1694586760742; Tue, 12 Sep 2023 23:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694586760; cv=none; d=google.com; s=arc-20160816; b=lDUTH3FMdyaUrrGE2haUEsBufoZE7IRkaouWStQDddN53MELJe3OQCDDp2Hr8gjeJt z3dK8eIqQxtyV1V2dJB2z21se090Xj7jsjZ3grkRdIClEkUDDRMU4ClZ+n6Vomdeks7p inP4OM50x0HhPTuMIJGBde8JvZ47Vh5AAiP51bv1ihsRdRg43r1OBJK3IJwArZYGl/sE zlEmKoIgdqYyeVGLMnSxKmHEARIu1w6ujZhVcnVQpJjvfFMyF5SFATKngHVa9uMYko0Z QOChlIF8+M66SxsigF5Nofje7BWdrL1bn2AjRtzpcIpODQxnTokfalcnvXIMGkuTq/cl Cosg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=DtPnDCTduCEq3Qr2ITLJnxh4c9FOD2gvVINJPxBbxIM=; fh=yqs1HYG6igK70OW5P8bO74CVtWmyfN5AzyYa3IY2+2E=; b=dDt093S3a0mCVzTEZVGBY9pmUY98yLDWTnKhvs2RVZ7TKU4egWxcUsKkTyrl6dixDS 7Sq3FieyCzph5m0Ue/bLIjN8zdv2oc23UpkwOu7AtDWPzYmaN+Xw6dInGAOwg6vvPbYn OGGRmGtGUiMKaBDTjoPn5jpL9Qz2470o2tM4sjSV73wzT/T3ZHtk/QNcBUjjk0+6kYg+ sGwS5ZV46FOq55huKfcJexP/e0sTAG0C3YoiksXcKTW1xxS2sdhBDZFySgLjNR4iSGOH VKu+QFMkSXF4y6rlQIQaLSWvEo9a1ZvpijP4Fl8y0YYqT5ZKRWfQKu3TWIXhLMNGKWZ/ pE3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=M9HE9gpS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id d7-20020a056a0024c700b0068fac3509a9si6755631pfv.350.2023.09.12.23.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 23:32:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=M9HE9gpS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3A83382B2E80; Tue, 12 Sep 2023 17:51:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbjIMAvL (ORCPT + 36 others); Tue, 12 Sep 2023 20:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233051AbjIMAvK (ORCPT ); Tue, 12 Sep 2023 20:51:10 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B72C1706 for ; Tue, 12 Sep 2023 17:51:06 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d7b9187c0b1so6005041276.1 for ; Tue, 12 Sep 2023 17:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694566265; x=1695171065; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=DtPnDCTduCEq3Qr2ITLJnxh4c9FOD2gvVINJPxBbxIM=; b=M9HE9gpSilLT/CYs0oWeMyB+mCD6/NQUz3ojVhqmGa3sHNL3qeDpQxnTxGrPn3HXVl 7wTZAFRNlH2BH65QvceQl7KpX8bC/u6SuqX9qlRWCLMXj13EAa1KuPHCalL2BOoeULLm kplnbB7z3Dq0+7lOZP7ctvBjuuFEq2JrSnP3mlfoFFlMVZ2+sqFQYmQvpGT+Juf3M227 SuN14b6S6wjEUi0UlnYMZLXuG8WJoCixjsM0zRH7hpWglM7pW3aNkZL5t0iq0aTsJdxc b98Gm4LsMdIXMBMdfJPFXXqYBy8lnPS6YG+R+0UMtqnx9V38ZEyDtL98BrivaH6R2nHM wZqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694566265; x=1695171065; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DtPnDCTduCEq3Qr2ITLJnxh4c9FOD2gvVINJPxBbxIM=; b=wFbfXJMFQ1YfjkWWbaWQ7ioz3VOYhsSsGQooTm1WLc3yp/LAC/9XXjpuCcDDKDTyWL d+Ng0u9v2IwuR2OapDuI+PLPOKgk7Jac8QJLprbHWqZad3xcxAXvoGO8SowkfOjeqiBx IfjrT6dn4m8+5ddkVJxfVcCMyhnXybC/z/AiG41UA9DCZoRaaKRYFndfSBtiB+H1ITjp F7vlAjY1wHqrvtC/+g/yopBfLXrlg5dAIR9F/OrrTbk4bWaa8wFoerdQ092fswtDQWKF 6XRFblzHz3OpCgFUks9FfaA0kdUHmdOMtpXJN7TC+LE6/iFi0gyRxMLBMSAQQ9bAjvmP IHJw== X-Gm-Message-State: AOJu0YzcgA2cX6LmnV1RIoCj/VWOhSzZNrcyYfM3rYERva6hh/lynGNX qYpocKMzltrbLgoj4SxnS8EMaweZafoR7A25+w== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:80cf:0:b0:d7a:8e37:6d4b with SMTP id c15-20020a2580cf000000b00d7a8e376d4bmr24345ybm.3.1694566265616; Tue, 12 Sep 2023 17:51:05 -0700 (PDT) Date: Wed, 13 Sep 2023 00:51:05 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHgHAWUC/x2NQQ6CMBBFr0Jm7SQtVSNexRiDw1QngRamlUgId 7eyeMl/m/9WSKzCCa7VCsqzJImhiD1UQO82vBilKw61qZ1prMOUNdC4YKcysyYkXcYcUULmHqc 2/3lQHIYY9vmhPiKh8cenPV+c8acGyvmo7OW7h2/3bfsBsFNY4YgAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694566264; l=1599; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=HFa7caLHh4Y4K31X6bYgfzu3rT5WKQkHKQH1LYS4bEc=; b=+lu5hyujktY6X9/cBe5+BmqWrHRCKzqDZdz0TNVSMtMZRhiU9xGmyaYaMN9EBmB1I+nNLMEz7 9VTSzTgoBnkDFy9+1xv8Sosc5rYEZRxUPDH1+VCngkJ7eL9yey6Slg7 X-Mailer: b4 0.12.3 Message-ID: <20230913-strncpy-drivers-crypto-intel-qat-qat_common-qat_uclo-c-v1-1-88a6c07fc924@google.com> Subject: [PATCH] crypto: qat - refactor deprecated strncpy From: Justin Stitt To: Giovanni Cabiddu , Herbert Xu , "David S. Miller" Cc: qat-linux@intel.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 12 Sep 2023 17:51:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776903007625133615 X-GMAIL-MSGID: 1776903007625133615 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. We should prefer more robust and less ambiguous string interfaces. `buf` is expected to be NUL-terminated for its eventual use in `kstrtoul()` and NUL-padding is not required. Due to the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt Acked-by: Giovanni Cabiddu Reviewed-by: Kees Cook --- Note: build-tested only. --- drivers/crypto/intel/qat/qat_common/qat_uclo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 2dde18cd1d8fac735875f2e4987f11817cc0bc2c change-id: 20230913-strncpy-drivers-crypto-intel-qat-qat_common-qat_uclo-c-0f4b16830f59 Best regards, -- Justin Stitt diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c index ce837bcc1cab..e2f82128043e 100644 --- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c +++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c @@ -200,7 +200,7 @@ static int qat_uclo_parse_num(char *str, unsigned int *num) unsigned long ae = 0; int i; - strncpy(buf, str, 15); + strscpy(buf, str, sizeof(buf)); for (i = 0; i < 16; i++) { if (!isdigit(buf[i])) { buf[i] = '\0';