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;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        xiahong.bao@nxp.com, eagle.zhou@nxp.com, tao.jiang_2@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/5] media: amphion: ensure the bitops don't cross boundaries
Date:   Tue, 18 Jul 2023 17:50:13 +0800
Message-Id: <f2ae16159150707d350a495711f5767c29a911bf.1689673395.git.ming.qian@nxp.com>
In-Reply-To: <cover.1689673395.git.ming.qian@nxp.com>
References: <cover.1689673395.git.ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HoyTVk+/VVt2nI1mu4oDvGVAqEE1IQE9ZzVLjYemyIsh6V2cknsKlGPqxmi9?=
 =?us-ascii?Q?VPT5+ZeRf+hwhzw4KnttUX4NynRh5qELCZuvTDHiKjfryf6jc/XQVGdNmNnL?=
 =?us-ascii?Q?Cjoh1y5cuFGLOqgeBjimmjpnjPrIRNd89kPX487RA97bdVF6QG6DuefrwXLA?=
 =?us-ascii?Q?bTiBYzVsjCYQz/rIfKYz13SjdsQjOBrglusXQeg4HZ/pRgicNE2wDv7/sTO7?=
 =?us-ascii?Q?RO3QFyvrqyJeE4vRzxgFIS/JEyGP8SEEGycDUJ0foGpsqR9WIt6jfTFmr5cy?=
 =?us-ascii?Q?6/Q4JSj1pD42JX4bJUS/LjBLLD+7D42YNgZujjSfKU/DjU/DeHWAkl0/O3Jz?=
 =?us-ascii?Q?mgT9yOeTAxe4HTDElZWRoPFQV+Bin5m/fCLAWP6DILLldS+w1TqC1NmLIW5a?=
 =?us-ascii?Q?IDF145SJBWof7ycO8S5LrHgFZWoFq9LGd8Y7Ie02RmTUoHy5vyPKNA5vM0B8?=
 =?us-ascii?Q?YfIU4TfhM+qypjmLfHH2bzr1r2rcBS75GGF66+HPuyDnsqLXJUhX1buA4RKA?=
 =?us-ascii?Q?vaA0NFbdFlkgbcPOYLPSlxkFVKE0AJyR0Ivm3XLj3lnxq0/jvF0ZUK0h7Cv5?=
 =?us-ascii?Q?JlQXbpKvugV8m0J6tR3T0Epco78w6ou6NfuY8O8mc502+ji3kLE11TAwalb0?=
 =?us-ascii?Q?9IjC6ppfIAjrgDFiVKzAKaHy6NV1rEqTKY2huesWYx96vYETkXT+XQ8S0SQ0?=
 =?us-ascii?Q?5BYKC/Rw7L6TxS7NRWn3Phta+0sYHQlUQe8KtXcbzb0wMfkWAiNYaVzTHCI3?=
 =?us-ascii?Q?/zF5vz4MJ0kFFTmpNcGgXs06BoB7hNnMbV1jfT4iGVbxp6kMcYhNJ0XgpEQC?=
 =?us-ascii?Q?PZPrfVEPi6TLLb9mULs+tgouueL3yL78QVJDSvvEdfjqRAxZ+hYpVnWV4L1v?=
 =?us-ascii?Q?Z1fNYNZVHJhx7moJY4VDfz91hoQID9Iqo6vhTQKzvOeoZrI1sKBxN1SL3vSJ?=
 =?us-ascii?Q?73ct1Dr0K1MG/RDa7vif3inTqt07mSAS60fQ155ge1Wp/wpoj/1/YoRh9GFL?=
 =?us-ascii?Q?DzMdDaUnRZyX7hNNuHAZ4NPVTVjVTw9VpHcCYOYJfq8N2g8xhkJB92NwkAi8?=
 =?us-ascii?Q?8cyQFEirXhqb8enZ+Tq9isS8Z5mfbwqtbra41Ntoe3HeHDuAVsGiMoalXbJE?=
 =?us-ascii?Q?b71sHb+0M78FLKYvqo3HE+5rf71XDC8u9+/hAg1dxj4qg0JTwl2uX7XoOfnl?=
 =?us-ascii?Q?lUm3VCVDe3GuKPTAF+a6oulV4m6NVltCg4NB+rF0RUM6EGnwbwRy+J67gDPV?=
 =?us-ascii?Q?fvBU4auueL9iIn3JkQLD4Jrvak0vweIzKiB3ABpVqgfz1J3a0W5K/L0cRCRN?=
 =?us-ascii?Q?YrpredeDr2qgKgmFXKnhYZmAOI77XFJTbEayrLi+zyF/R9JXr/9nSaelKYzf?=
 =?us-ascii?Q?1Qeh6ptsWOAGnO+o/n8kvC9sveJJpJZlrEGSqmil7QQsJU5wkDXX/1JJp7ps?=
 =?us-ascii?Q?HTPRDsEvsvsFmHcKhkhTyrXA7VM+uziiGpdOgEXlPpydCFuEYoJ6S0A8uwjw?=
 =?us-ascii?Q?ced9WKK013f/sAakGUVvkwXJL+fWJnIoLTD+LKaxzswZjMaNzeBzM/w7lhpC?=
 =?us-ascii?Q?YuHUJBEVIrZi+tBG0oKpqAg2Fp5leSkoL7WGJCHO?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 015a50e9-ba4e-4059-a296-08db87748034
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 09:51:04.9083
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 16WIEUkQmofalwWZ+KlMUUXrfltmzo9z19AvRSoKkubKYxmzZnTe2LuoqnEJlFoAgq1lt/+A5tA+WJvW3YpTUA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9243
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

the supported_instance_count determine the instance index range,
it shouldn't exceed the bits number of instance_mask,
otherwise the bitops of instance_mask may cross boundaries

Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vpu_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 43d85a54268b..6f054700d5db 100644
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -88,6 +88,8 @@ static int vpu_core_boot_done(struct vpu_core *core)
 
 		core->supported_instance_count = min(core->supported_instance_count, count);
 	}
+	if (core->supported_instance_count >= BITS_PER_TYPE(core->instance_mask))
+		core->supported_instance_count = BITS_PER_TYPE(core->instance_mask);
 	core->fw_version = fw_version;
 	vpu_core_set_state(core, VPU_CORE_ACTIVE);
 
-- 
2.38.1