Commit 2d2114ac authored by Junlin Li's avatar Junlin Li Committed by Xia Fukun
Browse files

drivers: media: dvb-frontends/rtl2830: fix an out-of-bounds write error 

mainline inclusion
from mainline-v6.12-rc5
commit 46d7ebfe6a75a454a5fa28604f0ef1491f9d8d14
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYPJG
CVE: CVE-2024-47697

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=46d7ebfe6a75a454a5fa28604f0ef1491f9d8d14



--------------------------------

Ensure index in rtl2830_pid_filter does not exceed 31 to prevent
out-of-bounds access.

dev->filters is a 32-bit value, so set_bit and clear_bit functions should
only operate on indices from 0 to 31. If index is 32, it will attempt to
access a non-existent 33rd bit, leading to out-of-bounds access.
Change the boundary check from index > 32 to index >= 32 to resolve this
issue.

Fixes: df70ddad ("[media] rtl2830: implement PID filter")
Signed-off-by: default avatarJunlin Li <make24@iscas.ac.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarXia Fukun <xiafukun@huawei.com>
parent c6de47cf

drivers/media/dvb-frontends/rtl2830.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int rtl2830_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, int on 
		index, pid, onoff);



	/* skip invalid PIDs (0x2000) */

	if (pid > 0x1fff || index > 32)

	if (pid > 0x1fff || index >= 32)

		return 0;



	if (onoff)