Unverified Commit 15addafa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4111 sysrq: avoid concurrently info printing by 'sysrq-trigger' 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J3XDIZ75KGARYUSQK4DPERCKB6MS5KG2/ 
 
https://gitee.com/openeuler/kernel/issues/I8XW8V 
 
Link:https://gitee.com/openeuler/kernel/pulls/4111

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents f1cdc2f3 8eadf73f

drivers/tty/sysrq.c

+6 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,9 @@ int unregister_sysrq_key(u8 key, const struct sysrq_key_op *op_p) 
EXPORT_SYMBOL(unregister_sysrq_key);



#ifdef CONFIG_PROC_FS



static DEFINE_MUTEX(sysrq_mutex);



/*

 * writing 'C' to /proc/sysrq-trigger is like sysrq-C

 */
@@ -1159,7 +1162,10 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, 


		if (get_user(c, buf))

			return -EFAULT;



		mutex_lock(&sysrq_mutex);

		__handle_sysrq(c, false);

		mutex_unlock(&sysrq_mutex);

	}



	return count;