Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c000153 authored by Myungho Jung's avatar Myungho Jung Committed by Greg Kroah-Hartman
Browse files

timer/sysclt: Restrict timer migration sysctl values to 0 and 1 



commit b94bf594cf8ed67cdd0439e70fa939783471597a upstream.

timer_migration sysctl acts as a boolean switch, so the allowed values
should be restricted to 0 and 1.

Add the necessary extra fields to the sysctl table entry to enforce that.

[ tglx: Rewrote changelog ]

Signed-off-by: default avatarMyungho Jung <mhjungk@gmail.com>
Link: http://lkml.kernel.org/r/1492640690-3550-1-git-send-email-mhjungk@gmail.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Kazuhiro Hayashi <kazuhiro3.hayashi@toshiba.co.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2f80348

kernel/sysctl.c

+2 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,8 @@ static struct ctl_table kern_table[] = { 
		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= timer_migration_handler,

		.extra1		= &zero,

		.extra2		= &one,

	},

#endif

#ifdef CONFIG_BPF_SYSCALL

kernel/time/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int timer_migration_handler(struct ctl_table *table, int write, 
	int ret;



	mutex_lock(&mutex);

	ret = proc_dointvec(table, write, buffer, lenp, ppos);

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (!ret && write)

		timers_update_migration(false);

	mutex_unlock(&mutex);