Reviewed-by: Xie XiuQi xiexiuqi@huawei.com

On 2021/3/25 20:59, Zhang Ming wrote:

openEuler inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I3D58V CVE: NA

---

No unlock operation is performed on the mpam_devices_lock before the return statement, which may lead to a deadlock.

Signed-off-by: Zhang Ming 154842638@qq.com Reported-by: Jian Cheng cj.chengjian@huawei.com Suggested-by: Jian Cheng cj.chengjian@huawei.com

---

arch/arm64/kernel/mpam/mpam_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/mpam/mpam_device.c b/arch/arm64/kernel/mpam/mpam_device.c index 1aca24f570d3..d8511527970a 100644 --- a/arch/arm64/kernel/mpam/mpam_device.c +++ b/arch/arm64/kernel/mpam/mpam_device.c @@ -560,8 +560,10 @@ static void __init mpam_enable(struct work_struct *work) mutex_lock(&mpam_devices_lock); mpam_enable_squash_features(); err = mpam_allocate_config();

• if (err)

• if (err) {

• mutex_unlock(&mpam_devices_lock);
  

  return;

• } mutex_unlock(&mpam_devices_lock);

  mpam_enable_irqs();