Unverified Commit 0473be3c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6312 fix CVE-2024-24861 for 5.10 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/23LEXGKBKWRCZF6WTRAYHQYVO5HETJZZ/ 
From: Ma Wupeng <mawupeng1@huawei.com>

fix CVE-2024-24861.

Gui-Dong Han (1):
  media: xc4000: Fix atomicity violation in xc4000_get_frequency


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I917JN 
 
Link:https://gitee.com/openeuler/kernel/pulls/6312

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 57ed0ab6 d75e5a50

drivers/media/tuners/xc4000.c

+2 −2
Original line number Diff line number Diff line
@@ -1517,10 +1517,10 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq) 
{

	struct xc4000_priv *priv = fe->tuner_priv;



	mutex_lock(&priv->lock);

	*freq = priv->freq_hz + priv->freq_offset;



	if (debug) {

		mutex_lock(&priv->lock);

		if ((priv->cur_fw.type

		     & (BASE | FM | DTV6 | DTV7 | DTV78 | DTV8)) == BASE) {

			u16	snr = 0;
@@ -1531,8 +1531,8 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq) 
				return 0;

			}

		}

		mutex_unlock(&priv->lock);

	}

	mutex_unlock(&priv->lock);



	dprintk(1, "%s()\n", __func__);