From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795057270; b=ehOwcBDgIuk3f0FrT/Fr9OaIFhSRr7KNcJ07ttSyZ6JoVyzp3ycJNbvbq0++o/kJ4kc+ csE/p7rn3p5raMDrenqwGNiQcDKOYuI/u5fIxSWoBdgEhyJqh3N222iQHuVoPez0arG/B uAGidO2NL8d3B5csE9sqKY0N3CeWW20ZaNAT08CflTg5dauyQ+N3VAreeJNLmMXEgYaa/ x2flIFj82xWsrTOJ9mwmW4c9TexpO6EAogzNNw9QgfEds8nsF9ZbyV7tv3vqA+VMmTVAz 7BuCe3UEPjYtvJVTueIb6E+gTifOYjvDH5zd35Do5eNtkYABTHqDxruBjnWv8kJ/pYQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795057270; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Sib7aLQKx3wA4q40fQxtUk5u09NjhsE4dlU7zArfmA4=; b=j5TY1VaB27V+FsMu7hi8p3ske7NqmrNcAM4irkx7ZRo/e6DSh8UesJBOMRUYQ2F5Cqb1 OuuGOAKArMoWw1Nz86e5C+oi/t66UrYrlR2NBKChNZobC//9vD6grK1Hy8x7DiF96vCbI dZoU8BXs24MLih1vqW4RkvtvDPwfegVh49Hjk7woAFUutYnTRD2278t/5iIrR4foRUgJC G7IJf+owZzn6XuT8PFXEE0rJ8rz0Is2l54Ad4Yfq6W1vP8X1URhIj37LfEjE8DlDW4sAv TdPn7yLtIOG1G1PViVlabJzcbaG5CYfHjx7T/z5N6ufRhFB4U0UHUm9CFoDXtgW5a6A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=TfFfgNPa; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 756D360A3807; Thu, 19 Nov 2026 03:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=TfFfgNPa Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FD871F000C4; Thu, 19 Nov 2026 03:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795057270; bh=Sib7aLQKx3wA4q40fQxtUk5u09NjhsE4dlU7zArfmA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TfFfgNPaReh2g2bNiDxqSBRwozDfCtlHImwa5tV4T63P6gW18FFKo5iA/LjGTmT5T EHRfORrzD0h1gCoqAGxE2aU44pHKCt7Yn52aE+dHZO+0R70+Mf4VE0Mw3niryCKzmF Ota4W2TpNt871XdHExlGNB1/bXBAqAhXIRl4D2gU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yousef Alhouseen , Hans Verkuil , Sasha Levin Subject: [PATCH 5.10 0071/1848] media: go7007: avoid undefined shifts in MPEG-4 headers Date: Wed, 18 Nov 2026 15:35:09 +0100 Message-ID: <20261118145914.077262123@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yousef Alhouseen [ Upstream commit 41f82777e547732460290ceb28fcc7c1b95ef192 ] The byte-alignment paths can call CODE_ADD() with a zero bit length. The macro then shifts an int by name.b, which can be 32 after the preceding bit was flushed. vti_bitlen() can likewise shift a signed int into its sign bit while searching for the bit length, and the package mask construction can shift by the full type width. Make zero-length additions a no-op, derive the bit length with fls(), and build the mask with GENMASK(). Signed-off-by: Yousef Alhouseen Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/usb/go7007/go7007-fw.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/media/usb/go7007/go7007-fw.c b/drivers/media/usb/go7007/go7007-fw.c index 018019ba47d46..d50304301eeae 100644 --- a/drivers/media/usb/go7007/go7007-fw.c +++ b/drivers/media/usb/go7007/go7007-fw.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include @@ -58,14 +59,16 @@ struct code_gen { #define CODE_GEN(name, dest) struct code_gen name = { dest, 0, 32, 0 } #define CODE_ADD(name, val, length) do { \ - name.b -= (length); \ - name.a |= (val) << name.b; \ - while (name.b <= 24) { \ - *name.p = name.a >> 24; \ - ++name.p; \ - name.a <<= 8; \ - name.b += 8; \ - name.len += 8; \ + if (length) { \ + name.b -= (length); \ + name.a |= (val) << name.b; \ + while (name.b <= 24) { \ + *name.p = name.a >> 24; \ + ++name.p; \ + name.a <<= 8; \ + name.b += 8; \ + name.len += 8; \ + } \ } \ } while (0) @@ -707,11 +710,10 @@ static int gen_mpeg1hdr_to_package(struct go7007 *go, static int vti_bitlen(struct go7007 *go) { - unsigned int i, max_time_incr = go->sensor_framerate / go->fps_scale; + unsigned int max_time_incr = go->sensor_framerate / go->fps_scale; + int bitlen = fls(max_time_incr); - for (i = 31; (max_time_incr & ((1 << i) - 1)) == max_time_incr; --i) - ; - return i + 1; + return bitlen ?: 1; } static int mpeg4_frame_header(struct go7007 *go, unsigned char *buf, @@ -1209,7 +1211,7 @@ static int seqhead_to_package(struct go7007 *go, __le16 *code, int space, 0xbf08, fps, 0xbf09, 0, 0xbff2, vop_time_increment_bitlength, - 0xbff3, (1 << vop_time_increment_bitlength) - 1, + 0xbff3, GENMASK(vop_time_increment_bitlength - 1, 0), 0xbfe6, 0, 0xbfe7, (fps / 1000) << 8, 0, 0, -- 2.53.0