From patchwork Tue May 16 23:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 94980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp757776vqo; Tue, 16 May 2023 16:19:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72RYFjEwxKicQ3K5BJ0qDyLXYsINoqx+4szFK6jk49Ha8ascoqT0f7eX3OlR1kkEta3jpB X-Received: by 2002:a05:6a20:3d27:b0:101:3abe:9aec with SMTP id y39-20020a056a203d2700b001013abe9aecmr34941086pzi.54.1684279173678; Tue, 16 May 2023 16:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684279173; cv=none; d=google.com; s=arc-20160816; b=Wv3mq3zuN42OP+mEYvka1USuO1JzsJ53r6BfAB/9Ql8zmdD4FthMZ/l9PH+EqP9xtj YqlJ9tGY1d1BoZJX3+eOKLfVLRmzgJFgBmVxG1wKdV0+n4vWToDSgqFgxGbEuVisHlfw Nejfp3gDGLg9wHyZ3BeX/ouMx/7DMkE9AdxBTaLUgb904dlv9nfNflJFZ3ELgLcjLIUC XTF7v63C7bG3iXgaoZg3LHlfNSfpQxtruxwvD8B01j9RbuvIbvDE12RrwmrbT33s4pp/ XIUKnOfvA2u+UtwRSpaAdTaEE6f+6iDbWeHnzOZZj71vM77TWTjEvgdaX362ThtZDljF hMcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=vBbnpYGCxI40QdqhlGYWlUbGFCeu1Y+QGty7t4B7s4o=; b=GBlCE9It2xtd9exsg0xYKqLgHd/GaER3OXJyhLoC+aVeVesJlD6n4Bq+FOxPsHLpOE BwDgqI4U6jWNMI1/eovkZc7SqCwdzTqmLEsmrWwJsXr59BU9SSAsaY3PhpALJh1NtoK7 xBmNm3g4MFKzkRLAI+Px7wWBte1QPL0URWLXatslOWubg1kLXnlQ2WlTksDQ9yvN7cXs mvXX8CjAMstYreQY/pONEdFhTJxztIuUMqsG+4ahwibZWO3crY8leNAot4JVBJXGl7rP VPX+1NARNT3SHWZ6OPLZo1AozuFXwbQOEs3zdbmrnSUlg8pF6HNRc9QmaVBx7Y8rul/C kGAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t5U7Yyk6; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r188-20020a632bc5000000b0051b2e37e657si18786785pgr.719.2023.05.16.16.19.19; Tue, 16 May 2023 16:19:33 -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=@kernel.org header.s=k20201202 header.b=t5U7Yyk6; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbjEPXN4 (ORCPT + 99 others); Tue, 16 May 2023 19:13:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231324AbjEPXNw (ORCPT ); Tue, 16 May 2023 19:13:52 -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 5CB1776AC; Tue, 16 May 2023 16:13:40 -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 E22976353D; Tue, 16 May 2023 23:13:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FEBDC433EF; Tue, 16 May 2023 23:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684278819; bh=ojFglRzZiKwXiqGnsWelyrmIMH1NnaD8AsZ7Wnf3niE=; h=Date:From:To:Subject:References:In-Reply-To:From; b=t5U7Yyk6479dQQEpLnOeyQ6rFAMBTkM4YJjSvLR0anyUjoJQm24IHqLG3DM+kJ5LM XbPKttG8ckt06eFvVEfm1cSTN98GHa15hI373WCRI3kImxceyyJEj82gr2cPUqjx7V wsh+Mc4CXX8KVxXM9BAFBTQfJ3x3ZhSrQ8SMUYOOysnZlQ5C/T4ru4Xk1zFGB80l5f srkPfZJNx9vfrUZpPeWOiw4MdavVd56SPxXG3z0PFcpQt0whDGXIMb9g1OuEeVaId5 ooR4LE1b/ldaSbNtI1KSuuayFXN33aziOOzLnO/p1qvxQgjeUv2tDJltn8z5F4YR06 d4NaIcfPoYIYQ== Date: Tue, 16 May 2023 17:14:27 -0600 From: "Gustavo A. R. Silva" To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 1/2][next] media: venus: hfi_cmds: Replace one-element array with flexible-array member Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766094465733957717?= X-GMAIL-MSGID: =?utf-8?q?1766094719206066944?= One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in struct hfi_session_set_buffers_pkt, and refactor the rest of the code, accordingly. This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1]. This results in no differences in binary output. Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/KSPP/linux/issues/292 Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1] Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/media/platform/qcom/venus/hfi_cmds.c | 12 ++++++------ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index bc3f8ff05840..21d1b3c90dc0 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -200,8 +200,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, struct hfi_buffer_info *bi; pkt->extradata_size = bd->extradata_size; - pkt->shdr.hdr.size = sizeof(*pkt) - sizeof(u32) + - (bd->num_buffers * sizeof(*bi)); + pkt->shdr.hdr.size = sizeof(*pkt) + + bd->num_buffers * sizeof(*bi); bi = (struct hfi_buffer_info *)pkt->buffer_info; for (i = 0; i < pkt->num_buffers; i++) { bi->buffer_addr = bd->device_addr; @@ -210,7 +210,7 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, } else { pkt->extradata_size = 0; pkt->shdr.hdr.size = sizeof(*pkt) + - ((bd->num_buffers - 1) * sizeof(u32)); + bd->num_buffers * sizeof(u32); for (i = 0; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; } @@ -243,8 +243,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, bi->extradata_addr = bd->extradata_addr; } pkt->shdr.hdr.size = - sizeof(struct hfi_session_set_buffers_pkt) - - sizeof(u32) + (bd->num_buffers * sizeof(*bi)); + sizeof(struct hfi_session_set_buffers_pkt) + + bd->num_buffers * sizeof(*bi); } else { for (i = 0; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; @@ -252,7 +252,7 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size = 0; pkt->shdr.hdr.size = sizeof(struct hfi_session_set_buffers_pkt) + - ((bd->num_buffers - 1) * sizeof(u32)); + bd->num_buffers * sizeof(u32); } pkt->response_req = bd->response_required; diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.h b/drivers/media/platform/qcom/venus/hfi_cmds.h index 99bc0b6db67c..ba74d03eb9cd 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.h +++ b/drivers/media/platform/qcom/venus/hfi_cmds.h @@ -117,7 +117,7 @@ struct hfi_session_set_buffers_pkt { u32 extradata_size; u32 min_buffer_size; u32 num_buffers; - u32 buffer_info[1]; + u32 buffer_info[]; }; struct hfi_session_get_sequence_header_pkt { From patchwork Tue May 16 23:14:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 94981 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp759154vqo; Tue, 16 May 2023 16:23:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4yxEEQDhTHL1Du3vfuYZbmR8fkVcmAXtp9N+2kyIZTCeBAjDbA6KrHEHfHKd4XJ6doYZEk X-Received: by 2002:a17:90b:1c8b:b0:233:fb7d:845a with SMTP id oo11-20020a17090b1c8b00b00233fb7d845amr40388886pjb.4.1684279388144; Tue, 16 May 2023 16:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684279388; cv=none; d=google.com; s=arc-20160816; b=gzWLxt4wpZsDKpy/tyVjLxdgwF5rXgvHz+UOnsGSTVcXfjCY+Jm/M9SjsL/5OoZ2+6 lbuUKYYtm+GokWYvu4e3VdBJApAQGazie+v2CX2v1JxVBw5VJ34uLUaZ1NGKOhPSIXYI OI7EWayISLiLW3X0fGF1ZfqhxNfRvJ38yzeJlC5okywr50pzuEBr24rn50+nSkYohgcz CTkliy6kRuxDXb3naiANb7CL9VIzBszISuoZKh7H1aMbVouHL+3dzNzAjRV4+P82BiYZ w9AEjFDaFgh4naq6X541XKCOOL2CDTaC6T75SJFtA3rTVnzoDcspquwhLd9xE3AzM9DT ukcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=qxrC1+9u9geKISW5J5QNbdME7VM3IPNIjuoTXcPrjzg=; b=KBaaMeuSEDqDMptDwuSCd8y56/GB64SXmRIOie7vRae2V0A2RUjWbiDSyjEPXNimIV IchtUO9eQD+dQnI5IiG/oFwraGjYHX1tUX+jxlU/iyWXaxUb98uu+rtaOOl61fE+q9Y0 RDfaP51Vp6YQDH9N1Jpgf3uZsfLjo9w8ktqVyNaN33s2Z1n7wPpmhw8Xlh0p/FPKQtfK oZdgVL8FYy2ags71UN71dTn59fnW+PbZ8EimtfuSqkn88wsxDqraGo3pvqKy4uGJqtqx nLmzGj/wmmj0v7XStvF23BrgfPYESrN5VOvaEICSt7lnLkfBEj0OheYDUxflWQOkUHAG LKDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="We6kEj/i"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ie17-20020a17090b401100b0024e4df1b2e3si296260pjb.123.2023.05.16.16.22.55; Tue, 16 May 2023 16:23:08 -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=@kernel.org header.s=k20201202 header.b="We6kEj/i"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbjEPXOP (ORCPT + 99 others); Tue, 16 May 2023 19:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231324AbjEPXOJ (ORCPT ); Tue, 16 May 2023 19:14:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32D0776B7; Tue, 16 May 2023 16:14:02 -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 779596353D; Tue, 16 May 2023 23:14:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E049C433D2; Tue, 16 May 2023 23:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684278840; bh=qaUrBJYyxwwKBd2OY03a0I58URs2kzWjK7mA8MAbaNs=; h=Date:From:To:Subject:References:In-Reply-To:From; b=We6kEj/iS+wYQuFQ6YbadjiFGSz9PNkVtATeks2aNWZ4b/s0nHpOeYGVdeB+QoMv/ ZEgm8y7BP/0iYJeGUlWyGq9RkwgpL2eyi/1Pzd6+Q5g+AQIZRV77yQCv+kibn+wEFo YOYe6qZacSRxylsteDg3/DS5GFbuoUFdVjl9x9ptW44T1yxoSuJaKXnViTFzJq4sTP vcC5B/qvpuUMLdEPw4rgt8YyRuzN2I2hxgbwseyaoU1XpgMYO5FJaqsWF0BzDiljXp kK77kxVG0irXdy1iDpoKix2jzzE8awrzLmQM2o9nvVVZXL5htSBVBr2RKhwcqnOk4Q G4zGPIQHjJdnw== Date: Tue, 16 May 2023 17:14:49 -0600 From: "Gustavo A. R. Silva" To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 2/2][next] media: venus: hfi_cmds: Use struct_size() helper Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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,T_SCC_BODY_TEXT_LINE 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?1766094943549956410?= X-GMAIL-MSGID: =?utf-8?q?1766094943549956410?= Prefer struct_size() over open-coded versions of idiom: sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count where count is the max number of items the flexible array is supposed to contain. Link: https://github.com/KSPP/linux/issues/160 Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 21d1b3c90dc0..3f74d518ad08 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -209,8 +209,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, } } else { pkt->extradata_size = 0; - pkt->shdr.hdr.size = sizeof(*pkt) + - bd->num_buffers * sizeof(u32); + pkt->shdr.hdr.size = struct_size(pkt, buffer_info, + bd->num_buffers); for (i = 0; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; } @@ -251,8 +251,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size = 0; pkt->shdr.hdr.size = - sizeof(struct hfi_session_set_buffers_pkt) + - bd->num_buffers * sizeof(u32); + struct_size((struct hfi_session_set_buffers_pkt *)0, + buffer_info, bd->num_buffers); } pkt->response_req = bd->response_required;