Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp1105467rdg; Wed, 11 Oct 2023 14:54:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0VrgVjd5/ohcb9Y9IHH6RQlBa75vIEz6yojScctmsDyVPGZFWUv1RtjMv8fdnisCEhEMZ X-Received: by 2002:a05:6a20:3942:b0:174:2c0:a4e2 with SMTP id r2-20020a056a20394200b0017402c0a4e2mr2063364pzg.39.1697061250754; Wed, 11 Oct 2023 14:54:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697061250; cv=none; d=google.com; s=arc-20160816; b=AXoY5qZ2E/t32tIZ9bqSfrVahUzibkNTfhwohY79GK+j5mi5GP8qFRFZuMaUCdd4Vz ca4V0ittl58x4YpXjn3SGnbutIYE1iHNL3IHNbqrqBrnfO6gh/0NCaqz3nMzwHwWII0d H/tL1HSfKEYUMNZTIapxjs44KZGo6Jq02Cotr3i9tKm7FNHpDI9QGoGRvFyH26xOnHY2 X102GlNYVxxIlBMZWHo2XbgN7B5cSUX7qXfBJxDipo4y/MnHMb7eS5oiv1I6OHjbuG8p 3arKm80cnECRG6OEHt2TaIMw0lOkZLNqX4ZtGsMQabs2JPnB5yylC+zdB9CW3Sm0YlL4 FACQ== 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=z0mEh2eQbdOiMZkH+CgX68hk8AnM/JOc/WD0lj3h3vo=; fh=D5Jb+LWzfkRy9iYIVCy4VMu6qdKI96SHF3qwFgisxrY=; b=Hub4EYL5STBdFEQMK/zyN8oFea+eyyGQEwQdcJN04h9tZHlDBclQVhl1neDYdD2I+e LBJg8gMm5puXDhB7EH/hpi/pM/BMLKhUWTVZ5AM0xkTMFl4fc1FGi1/V9UcO3vgTtb+o 0BW3y02kDDMXUJAxxhM34MHD1jC3Ox0uQNUM9JcBEKUHkTD2sAYBLDi3z6s6YW8tKKV4 LBoTHrx+s7vylkeB/a1zjoPe/TaCDNNbGbqZBqIOjBdaSkthP4p3UX6lNJ9TnaHRo9r/ LOyj+ziIGUzStIxBLg83jWUqWbWMeSLH2hd+cvfE3eOGMoJEsoP6wRIN8WPekDbkGfEe 0c1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=X34h2Y2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id bv8-20020a632e08000000b00578bb6fe9c5si673240pgb.445.2023.10.11.14.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 14:54:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=X34h2Y2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id E4B7B80CE7D5; Wed, 11 Oct 2023 14:54:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233718AbjJKVxs (ORCPT + 99 others); Wed, 11 Oct 2023 17:53:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233771AbjJKVxr (ORCPT ); Wed, 11 Oct 2023 17:53:47 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EC3DAF for ; Wed, 11 Oct 2023 14:53:46 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5a7c97d5d5aso4664727b3.3 for ; Wed, 11 Oct 2023 14:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697061225; x=1697666025; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=z0mEh2eQbdOiMZkH+CgX68hk8AnM/JOc/WD0lj3h3vo=; b=X34h2Y2P+Q5oHS2+qlEu/nfKIp10yRHS09FNOvi88rGu7EqT8oo+vSeY+8nLAEikoj w3Hs1IuM/aATxMb5GxxI4jS9vGCLEdQwyz8wgCTVsvz8mKNJnE0IzRGcvAKk5Z+Ve6NJ kLolAGeqle0xrOHIEC0OYQNgtiy4syqDeq3d9RybMa7/dHc/uf4PKcRDYFSEVEC7EVGy VVuzW2DtKNhowJ80PlhTEfnNKNF9/QwW+EYyYM47e13lPreGMwMUvN1ahRZA9+e90F8Z CU1FRlvwPqXBPbAvLG1VhuPKSrh5Pyhc7RZbbv9RhBxfDmtqwr6kGKMP9jyvX3zotKTA G2lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697061225; x=1697666025; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=z0mEh2eQbdOiMZkH+CgX68hk8AnM/JOc/WD0lj3h3vo=; b=RPukG9lnlEdbGLt5PH78Jvq7amDkmLuk2IoOh23DusM3426ACR/zl574+KmCsH7lUG Bdko892gxz/9N270KvcIHuUpUgF3w8xenF896iflnA/NNSm7AMRsNAdYnQ61EI3Qn+k0 bM0sD5tYX/vEbIivEIlmERTErox61zdC71BE2ZWh4gnhPAChFV72v6IytqlaJ8bDKXW/ 7Rsu3ln6KeTdtJ11u+ZkxhSnZMbAxj1oi9PBzky/yT9sZQ9cSlJFmnNH8vncrmBzmLqA 0/zQMmXja7mPZuwx4VXEJsaAVCOr2QBU5lHKkaXjUUPPUy6SYqBAfaeW/Qphj1Xrs1hE EFLQ== X-Gm-Message-State: AOJu0YxEB2uJo3Hs8yk3cuiIHKHQVX0NlRArrggVkdctiebkUrzBGlwl q080DQaN5IgFlUEQ6G+MoQd6KFPXbCUFhrwBwg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:1f56:0:b0:d7e:7a8a:2159 with SMTP id f83-20020a251f56000000b00d7e7a8a2159mr373076ybf.5.1697061225382; Wed, 11 Oct 2023 14:53:45 -0700 (PDT) Date: Wed, 11 Oct 2023 21:53:44 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGcZJ2UC/yWNSwrDMAwFrxK0rsByFv1cpZRibKXRooqRTGgJu XvddvOY2czbwNmEHS7DBsaruCzahQ4D5Dnpg1FKd4ghjhSI0Jtprm8sJiubo3JDbjPbFyqrJy0 L9ork/96fSRQzHsN5Ok3EaaQIPV+NJ3n9rq+3ff8AtMyfvYoAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697061224; l=1801; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=nMuSVOhysev7uUh/Sd/w6qnA6sjV53pd+anm3qSOdWM=; b=YIDWB6LpP36QEb79ACUN9X7xFlKvJc7IleF4p1QG5Yl7uybR9TYv1KHDJInStRLYBNOkkGYBj dIGBBHJSvRSBT/tC28YNnxzt1ZJI6cXmWHQHfQRcbejP0mHLDgv4Y5x X-Mailer: b4 0.12.3 Message-ID: <20231011-strncpy-drivers-net-ethernet-pensando-ionic-ionic_main-c-v1-1-23c62a16ff58@google.com> Subject: [PATCH] ionic: replace deprecated strncpy with strscpy From: Justin Stitt To: Shannon Nelson , Brett Creeley , drivers@pensando.io, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt Content-Type: text/plain; charset="utf-8" X-Spam-Status: No, score=-4.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Wed, 11 Oct 2023 14:54:08 -0700 (PDT) strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. NUL-padding is not needed due to `ident` being memset'd to 0 just before the copy. Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. 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 --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index 1dc79cecc5cc..835577392178 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -554,8 +554,8 @@ int ionic_identify(struct ionic *ionic) memset(ident, 0, sizeof(*ident)); ident->drv.os_type = cpu_to_le32(IONIC_OS_TYPE_LINUX); - strncpy(ident->drv.driver_ver_str, UTS_RELEASE, - sizeof(ident->drv.driver_ver_str) - 1); + strscpy(ident->drv.driver_ver_str, UTS_RELEASE, + sizeof(ident->drv.driver_ver_str)); mutex_lock(&ionic->dev_cmd_lock); --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231011-strncpy-drivers-net-ethernet-pensando-ionic-ionic_main-c-709f8f1ea312 Best regards, -- Justin Stitt