From patchwork Thu Oct 13 17:52:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp412969wrs; Thu, 13 Oct 2022 11:12:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4iZwKLZ1LhZOobZ4CVdDbftuHbURl1kaNuApqBRWAHEvpPRkq0NiZ5N2ecNsm/+8BNDOBe X-Received: by 2002:a17:902:d714:b0:17f:5813:1df4 with SMTP id w20-20020a170902d71400b0017f58131df4mr1013612ply.148.1665684723020; Thu, 13 Oct 2022 11:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684723; cv=none; d=google.com; s=arc-20160816; b=jhzpJDd8mg7cnyfmb9YsmxIahSGayQFNadC7HXAOIjafZI2yVX5EilwL5GS53P23Yh ip9FKfcLPNJZjiL5dQOfkuzpF8OTcEMGqdFUPIYgHnoodIFgvEWgwoV1fN4TOOGwInf9 FvytK+D++q4grh/kDih02Y7gmF25qconl/zixYXIdbCw49/xFYqiKgUkP5opuNMRen+t EunTXvmnQZi41DtF6p+6IR5X7jAefmnToTT2LoMLvJzptcRzl05/pF8Ii480LFY64SEF AT7h8p7Q9n1pa7WZ4LMYJcbSulQVi/laj4FYYOJwICXNvGKLDHyiqe2qNgTC1X+L2GDl I6hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Pk89Ne7J7uv4B7cRzuJ+HfQoXxeNskDzRj2up5O6c7E=; b=d0MABs/YxzBWC8jUN7/zsfd7yZhuofloTcrK8+DPHworaE/TYmEtdz1ohjE1lQo7PJ I+VlU7u2HauM0wD1UwxOr7BwFS0liFBMFM3SNM0Z7BFNgN6S23vcofpPoiWcVdZucVYJ /ur5b+vA/ANhahzeek21ad0AtgqpCBc72I0t8dt0cV50Q0KZroprQNLQDJNhQnyZ4vWp ODDzfyt+mF+SgeNc52q1E9kmw29YNcc9rzCeH045AtF+ptW2KWYjSNMtrbnNA3r3aRFK ybTglgaqv+X77PDqSU1t8r2yJoD5KBaZDhzJNtRVQpE4wbTyGctwbLH2nhlgaZV6ZPCH LYgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yepWkHyW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t18-20020a170902e85200b0017f77922b11si494552plg.84.2022.10.13.11.11.49; Thu, 13 Oct 2022 11:12:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yepWkHyW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231310AbiJMSL1 (ORCPT + 99 others); Thu, 13 Oct 2022 14:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231511AbiJMSKf (ORCPT ); Thu, 13 Oct 2022 14:10:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 781A5B03FB; Thu, 13 Oct 2022 11:07:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 339376191D; Thu, 13 Oct 2022 17:55:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38026C433D7; Thu, 13 Oct 2022 17:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683740; bh=Nrjzs/H2egeDQFrckuWu56rSL09kwzfFao0QMA0ZHHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yepWkHyWZQ8QUf4tei1ooesbc8/69RKGhY/2f37UKGHNhTngxMzupyA+LWGIS1+73 vI62DexCZZL1kUfhztPz+BGDHg+R6jU9oK9LdhW3PhnUJSJuxb0YXhQjDF0qCzipim cNEdVD5sd3KVuP5UTY22mvaEPdaRIIe9Mhr85TK0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Stephen Boyd , Bjorn Andersson , Andrew Chernyakov Subject: [PATCH 5.10 33/54] rpmsg: qcom: glink: replace strncpy() with strscpy_pad() Date: Thu, 13 Oct 2022 19:52:27 +0200 Message-Id: <20221013175148.153971624@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746597024273870262?= X-GMAIL-MSGID: =?utf-8?q?1746597024273870262?= From: Krzysztof Kozlowski commit 766279a8f85df32345dbda03b102ca1ee3d5ddea upstream. The use of strncpy() is considered deprecated for NUL-terminated strings[1]. Replace strncpy() with strscpy_pad(), to keep existing pad-behavior of strncpy, similarly to commit 08de420a8014 ("rpmsg: glink: Replace strncpy() with strscpy_pad()"). This fixes W=1 warning: In function ‘qcom_glink_rx_close’, inlined from ‘qcom_glink_work’ at ../drivers/rpmsg/qcom_glink_native.c:1638:4: drivers/rpmsg/qcom_glink_native.c:1549:17: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation] 1549 | strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings Signed-off-by: Krzysztof Kozlowski Reviewed-by: Stephen Boyd Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220519073330.7187-1-krzysztof.kozlowski@linaro.org Signed-off-by: Andrew Chernyakov Signed-off-by: Greg Kroah-Hartman --- drivers/rpmsg/qcom_glink_native.c | 2 +- drivers/rpmsg/qcom_smd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1472,7 +1472,7 @@ static void qcom_glink_rx_close(struct q cancel_work_sync(&channel->intent_work); if (channel->rpdev) { - strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); + strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY; --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1073,7 +1073,7 @@ static int qcom_smd_create_device(struct /* Assign public information to the rpmsg_device */ rpdev = &qsdev->rpdev; - strncpy(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); + strscpy_pad(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); rpdev->src = RPMSG_ADDR_ANY; rpdev->dst = RPMSG_ADDR_ANY; @@ -1304,7 +1304,7 @@ static void qcom_channel_state_worker(st spin_unlock_irqrestore(&edge->channels_lock, flags); - strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); + strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY; rpmsg_unregister_device(&edge->dev, &chinfo);