Unverified Commit 4e62d834 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8839 blk-iocost: avoid out of bounds shift 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LOBDVAFM2J34PS7LFA4WLBS4IUB7KNK5/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9U4LC 
 
Link:https://gitee.com/openeuler/kernel/pulls/8839

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7f24eaa2 fa084d52

block/blk-iocost.c

+4 −3
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now) 
{

	struct ioc *ioc = iocg->ioc;

	struct blkcg_gq *blkg = iocg_to_blkg(iocg);

	u64 tdelta, delay, new_delay;

	u64 tdelta, delay, new_delay, shift;

	s64 vover, vover_pct;

	u32 hwa;
@@ -1315,8 +1315,9 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now) 


	/* calculate the current delay in effect - 1/2 every second */

	tdelta = now->now - iocg->delay_at;

	if (iocg->delay)

		delay = iocg->delay >> div64_u64(tdelta, USEC_PER_SEC);

	shift = div64_u64(tdelta, USEC_PER_SEC);

	if (iocg->delay && shift < BITS_PER_LONG)

		delay = iocg->delay >> shift;

	else

		delay = 0;