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 X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBE54C432BE for ; Wed, 28 Jul 2021 02:05:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1DF260FBF for ; Wed, 28 Jul 2021 02:05:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233865AbhG1CFS (ORCPT ); Tue, 27 Jul 2021 22:05:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:50434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbhG1CFQ (ORCPT ); Tue, 27 Jul 2021 22:05:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9266560F9C; Wed, 28 Jul 2021 02:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627437915; bh=2pHGTZ3zG2izbzSDc/FoK6QLfwWAp2guM0LU9c0ReoM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=A90UDbvYC68sVjy8WS8RsYKs+VyQnHbePNodp+Mph5MJd1I4oIlaX+oskjcTjKTyH yQ7mTTTNdv2h+JXdWv1KSFEc7PjWzPD6+c34uce4NAaAc1bic5Idu3jxsehfLL6Eij mARz6S+1199MQ2Upy0mfQnwpDIJrFHEl93pv8eXy4T1H4MHPRRCGAxGQywIOjH/ISG ZQfRRT3l9E/AZ+djOHJp8RsjaL+YqCgcVrG+OebfxlYzxYZslrcvKQ+G8STZSl/MiW A46vS61UDoPhBUZWvI5rnvf6u//RdOKM+e6TXxw5V+iHumywol5vccdZwZaFpyXjlS 4vjW7Esac6Huw== Date: Tue, 27 Jul 2021 21:07:45 -0500 From: "Gustavo A. R. Silva" To: Kees Cook Cc: linux-hardening@vger.kernel.org, Keith Packard , Greg Kroah-Hartman , Andrew Morton , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-staging@lists.linux.dev, linux-block@vger.kernel.org, linux-kbuild@vger.kernel.org, clang-built-linux@googlegroups.com Subject: Re: [PATCH 03/64] rpmsg: glink: Replace strncpy() with strscpy_pad() Message-ID: <20210728020745.GB35706@embeddedor> References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-4-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210727205855.411487-4-keescook@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 27, 2021 at 01:57:54PM -0700, Kees Cook wrote: > The use of strncpy() is considered deprecated for NUL-terminated > strings[1]. Replace strncpy() with strscpy_pad() (as it seems this case > expects the NUL padding to fill the allocation following the flexible > array). This additionally silences a warning seen when building under > -Warray-bounds: > > ./include/linux/fortify-string.h:38:30: warning: '__builtin_strncpy' offset 24 from the object at '__mptr' is out of the bounds of referenced subobject 'data' with type 'u8[]' {aka 'unsigned char[]'} at offset 24 [-Warray-bounds] > 38 | #define __underlying_strncpy __builtin_strncpy > | ^ > ./include/linux/fortify-string.h:50:9: note: in expansion of macro '__underlying_strncpy' > 50 | return __underlying_strncpy(p, q, size); > | ^~~~~~~~~~~~~~~~~~~~ > drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_work': > drivers/rpmsg/qcom_glink_native.c:36:5: note: subobject 'data' declared here > 36 | u8 data[]; > | ^~~~ > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings > > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/rpmsg/qcom_glink_native.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c > index 05533c71b10e..c7b9de655080 100644 > --- a/drivers/rpmsg/qcom_glink_native.c > +++ b/drivers/rpmsg/qcom_glink_native.c > @@ -1440,7 +1440,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, > } > > rpdev->ept = &channel->ept; > - strncpy(rpdev->id.name, name, RPMSG_NAME_SIZE); > + strscpy_pad(rpdev->id.name, name, RPMSG_NAME_SIZE); > rpdev->src = RPMSG_ADDR_ANY; > rpdev->dst = RPMSG_ADDR_ANY; > rpdev->ops = &glink_device_ops; > -- > 2.30.2 > 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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CED67C43214 for ; Wed, 28 Jul 2021 02:05:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97D7C60F9C for ; Wed, 28 Jul 2021 02:05:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 97D7C60F9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 016416E3C1; Wed, 28 Jul 2021 02:05:17 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7BF06E3C1 for ; Wed, 28 Jul 2021 02:05:15 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 9266560F9C; Wed, 28 Jul 2021 02:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627437915; bh=2pHGTZ3zG2izbzSDc/FoK6QLfwWAp2guM0LU9c0ReoM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=A90UDbvYC68sVjy8WS8RsYKs+VyQnHbePNodp+Mph5MJd1I4oIlaX+oskjcTjKTyH yQ7mTTTNdv2h+JXdWv1KSFEc7PjWzPD6+c34uce4NAaAc1bic5Idu3jxsehfLL6Eij mARz6S+1199MQ2Upy0mfQnwpDIJrFHEl93pv8eXy4T1H4MHPRRCGAxGQywIOjH/ISG ZQfRRT3l9E/AZ+djOHJp8RsjaL+YqCgcVrG+OebfxlYzxYZslrcvKQ+G8STZSl/MiW A46vS61UDoPhBUZWvI5rnvf6u//RdOKM+e6TXxw5V+iHumywol5vccdZwZaFpyXjlS 4vjW7Esac6Huw== Date: Tue, 27 Jul 2021 21:07:45 -0500 From: "Gustavo A. R. Silva" To: Kees Cook Subject: Re: [PATCH 03/64] rpmsg: glink: Replace strncpy() with strscpy_pad() Message-ID: <20210728020745.GB35706@embeddedor> References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-4-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210727205855.411487-4-keescook@chromium.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kbuild@vger.kernel.org, Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-block@vger.kernel.org, clang-built-linux@googlegroups.com, Keith Packard , linux-hardening@vger.kernel.org, netdev@vger.kernel.org, Andrew Morton Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 27, 2021 at 01:57:54PM -0700, Kees Cook wrote: > The use of strncpy() is considered deprecated for NUL-terminated > strings[1]. Replace strncpy() with strscpy_pad() (as it seems this case > expects the NUL padding to fill the allocation following the flexible > array). This additionally silences a warning seen when building under > -Warray-bounds: > > ./include/linux/fortify-string.h:38:30: warning: '__builtin_strncpy' offset 24 from the object at '__mptr' is out of the bounds of referenced subobject 'data' with type 'u8[]' {aka 'unsigned char[]'} at offset 24 [-Warray-bounds] > 38 | #define __underlying_strncpy __builtin_strncpy > | ^ > ./include/linux/fortify-string.h:50:9: note: in expansion of macro '__underlying_strncpy' > 50 | return __underlying_strncpy(p, q, size); > | ^~~~~~~~~~~~~~~~~~~~ > drivers/rpmsg/qcom_glink_native.c: In function 'qcom_glink_work': > drivers/rpmsg/qcom_glink_native.c:36:5: note: subobject 'data' declared here > 36 | u8 data[]; > | ^~~~ > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings > > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/rpmsg/qcom_glink_native.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c > index 05533c71b10e..c7b9de655080 100644 > --- a/drivers/rpmsg/qcom_glink_native.c > +++ b/drivers/rpmsg/qcom_glink_native.c > @@ -1440,7 +1440,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, > } > > rpdev->ept = &channel->ept; > - strncpy(rpdev->id.name, name, RPMSG_NAME_SIZE); > + strscpy_pad(rpdev->id.name, name, RPMSG_NAME_SIZE); > rpdev->src = RPMSG_ADDR_ANY; > rpdev->dst = RPMSG_ADDR_ANY; > rpdev->ops = &glink_device_ops; > -- > 2.30.2 >