From patchwork Fri Oct 20 19:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 156301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1292709vqb; Fri, 20 Oct 2023 12:57:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENK+lyjmwrmdUcpMJ4PEv3GowqivHevW+dXbsXjm9lgdlQXXk643WB4tTjNWwtSEEuUwuS X-Received: by 2002:a05:6a21:118c:b0:16c:1340:c621 with SMTP id oj12-20020a056a21118c00b0016c1340c621mr2778573pzb.31.1697831837566; Fri, 20 Oct 2023 12:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697831837; cv=none; d=google.com; s=arc-20160816; b=yDmQGiKBY3MR7Hw/lF4VqtlAgXDIPu08t39+f2uiH8AWE0k/Px6+nhVLf8blaL/Vfv 7cimxNoWVpNAPZbxGrmXE4kPCD0mpXLDN6ng3q91ZRBS2GN/vnhad0BHiLmzy8BOAGCJ ru5lS9aIVfLwjl1pyWPViT/VxhY8WYBy+zl4mvJYOZGTTVSf6EqNXAIdOrg9q5Kwnm2o GJO9aGPTU3DRrrtk8W1gZf06lKoQipkZpOXXVgZarlp6oizwMPIs153Jw6CDuPeIMyH1 uAZtaieQjJmr7fWfFH/FhvYOGJ3fsQ92iq98tJL/Oh8EatqzJdj7AJQFzSiHs6cPzyKf f7JA== 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=wsBMquxJoi1c1zfpSSx0JVGoWkpT5IvUUb/lk/u2m3c=; fh=b7RIYDdeCE9vm6+wpios8G7aVa2LsR2ZMGz66hkqU7U=; b=dcYHJSXzv1xrcMDt6NDHFJoi/N8vkhCqVGrPTd+ZwcHqiphvjxsy7aKe+3uF+3FFcS Fjn/mpoUixi21MZe6xhgMzHQEbvmtuMD8pFQd4ASvsDlHhtr7Rv/GGmm90GB+0EPTde8 zg1qhY/5zLIQ55SnmojQh5Dqvq6l14nh3+JNbJQK+6b3QBjPrSZst+Bgz7hnHuQcGr9Z tc60u9DXjVb6CA0Fcq+VChIQFq9o1MOsNpOVg7muv8brJ1lqllpTDc8gAxnxScSkRBYS P1YjZi0dtICyr07zefmeXzuaEK5Cm+7Kk3SrGdedlUDHru3HnrOC/ZdhI0Izg4ciVW9D 8aPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="G/vrYWot"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id l71-20020a633e4a000000b0055b731aa9adsi2282124pga.562.2023.10.20.12.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 12:57:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="G/vrYWot"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id E40ED8279EF7; Fri, 20 Oct 2023 12:57:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229997AbjJTT5F (ORCPT + 26 others); Fri, 20 Oct 2023 15:57:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbjJTT5E (ORCPT ); Fri, 20 Oct 2023 15:57:04 -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 4B5FFD57 for ; Fri, 20 Oct 2023 12:57:02 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5a7d1816bccso16305977b3.1 for ; Fri, 20 Oct 2023 12:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697831821; x=1698436621; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=wsBMquxJoi1c1zfpSSx0JVGoWkpT5IvUUb/lk/u2m3c=; b=G/vrYWot0Ap1j5C/qKfbDn+3NuWsLdvK0/N6bpS82BQ0MH7QCleJi12x4BysFkJ35J /J+fy1tzOapgz+UMdHG07x5HcuJgXBsEG55b4kffnv6YWeGIUkByngLuBTNy3v6L1lyO csVY4hCt2HuhBPtSHUag0s1dp0ADtzTqaEXY4nBERC4rv8Xc5oslw8dJWvaF8Zh07NOC oYykc7cqztFqc5RP4WmKy3679z+U50UGaDLsl1kItPgBdcMJ23yWm0JQaoP6P3cTQZXB LQ0e1wubXqsdiwcmg3rwy8RopO4jEJ9LmAkglIFRuYP0BysH3M3nlVC+T0rbQkgW2QtM f8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697831821; x=1698436621; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wsBMquxJoi1c1zfpSSx0JVGoWkpT5IvUUb/lk/u2m3c=; b=Nqt+ulqMUJ/QZlhYUN4XZqHgDKQgefCdb67vUadg9pb6wPg8Iy5kYMZKr3UhDP9IS2 UTGKH+i8yzMDRQwKKSL+lFP2IV6ANpsaCdH5anGH/eHGvmPmDn4zJGQT2nV4VWE4jrIc HBP3XXNTcadBTP34ppmuF6FIgdUn+1YmEfYQF3psh5rXLNSbQq5Ob9lX3jlZn/vVESYY Dy/cwx/tRTOjXYdfF9XEIUaKMkEK1NKR5Xtvty56qRa5Lcf+wwhtpn3TbE82c/ir7d80 wRDVNG/3WauK0B17ePAKR5sXxRJYLp2mS/H4+e5BeeTtPs+lze56uWoiiXYn7Bjuiudr xL+w== X-Gm-Message-State: AOJu0YwfZlsLD6n7+qHiiKiHSrrdmiZA4kJL/nztQxlnePCB40SVSOwb sTZp3S3ZktbPa8zEtkLJnnXObEfdf2Z4HjmqbA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:c5cf:0:b0:d9c:a498:c1ef with SMTP id v198-20020a25c5cf000000b00d9ca498c1efmr57226ybe.9.1697831821508; Fri, 20 Oct 2023 12:57:01 -0700 (PDT) Date: Fri, 20 Oct 2023 19:56:59 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAIrbMmUC/yWNwQqDMBAFf0X23IWYIGJ/pUgJ8dXuwRh2RVrEf 2+ol4G5zBxkUIHRvTlIsYvJmqu0t4bSO+YZLFN18s6H1nnHtmlO5cuTyg411rLYfPGZVgUnRvC IfRhi6DuqoaJ4yec/eYzn+QNaVw6GdAAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697831820; l=2022; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=xbKvdfML9Lhch2EvPasPnGLhNiINuxHk8T8T1a03niU=; b=VN3iQrEIlCAFm02G2atoU3NZxN/Tsd8NY36yuCIPB9X7iXIHpap9Hd0s9G3zCWE+K8LLjH517 6D7jh0mioyKCAZFt28Q+rD8EfJYtBJnDYNJPlagbe1/1tVg7JodQ6MT X-Mailer: b4 0.12.3 Message-ID: <20231020-strncpy-drivers-rpmsg-rpmsg_core-c-v1-1-a86b7930c1cf@google.com> Subject: [PATCH] rpmsg: core: replace deprecated strncpy with strscpy From: Justin Stitt To: Bjorn Andersson , Mathieu Poirier Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 12:57:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780305716901029559 X-GMAIL-MSGID: 1780305716901029559 strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We expect chinfo.name to be NUL-terminated based on its usage with strncmp(): rpmsg_core.c: 389: if (strncmp(chinfo->name, rpdev->id.name, RPMSG_NAME_SIZE)) Moreover, NUL-padding is not required as chinfo has stack default initialized all fields to zero: rpmsg_core.c: 539: struct rpmsg_channel_info chinfo = {}; 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. Also, favor the more idiomatic strscpy() usage of: (dest, src, sizeof(dest)). 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 Similar-to: https://lore.kernel.org/all/20231018-strncpy-drivers-net-wwan-rpmsg_wwan_ctrl-c-v1-1-4e343270373a@google.com/ --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/rpmsg/rpmsg_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: bb55d7f7f7445abcc8db50e6a65d4315e79f75c7 change-id: 20231020-strncpy-drivers-rpmsg-rpmsg_core-c-e32ea739a375 Best regards, -- Justin Stitt diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index 32b550c91d9f..8abc7d022ff7 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -545,7 +545,7 @@ static int rpmsg_dev_probe(struct device *dev) goto out; if (rpdrv->callback) { - strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE); + strscpy(chinfo.name, rpdev->id.name, sizeof(chinfo.name)); chinfo.src = rpdev->src; chinfo.dst = RPMSG_ADDR_ANY;