diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-02-28 14:00:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-25 11:49:07 +0200 |
| commit | 373addcaedb67114a014f6cc5a1fe6320af094d5 (patch) | |
| tree | 7dfbdbccbfa309af5a2480c12bdbb5a98000dafb /drivers/char | |
| parent | fb413e95f02364612bb97c40ed8cd4d0945edcff (diff) | |
| download | linux-stable-373addcaedb67114a014f6cc5a1fe6320af094d5.tar.gz linux-stable-373addcaedb67114a014f6cc5a1fe6320af094d5.tar.bz2 linux-stable-373addcaedb67114a014f6cc5a1fe6320af094d5.zip | |
random: don't let 644 read-only sysctls be written to
commit 77553cf8f44863b31da242cf24671d76ddb61597 upstream.
We leave around these old sysctls for compatibility, and we keep them
"writable" for compatibility, but even after writing, we should keep
reporting the same value. This is consistent with how userspaces tend to
use sysctl_random_write_wakeup_bits, writing to it, and then later
reading from it and using the value.
Cc: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/random.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 512f15162d59..2a6287dabbfe 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1662,6 +1662,13 @@ static int proc_do_uuid(struct ctl_table *table, int write, return proc_dostring(&fake_table, 0, buffer, lenp, ppos); } +/* The same as proc_dointvec, but writes don't change anything. */ +static int proc_do_rointvec(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return write ? 0 : proc_dointvec(table, 0, buffer, lenp, ppos); +} + extern struct ctl_table random_table[]; struct ctl_table random_table[] = { { @@ -1683,14 +1690,14 @@ struct ctl_table random_table[] = { .data = &sysctl_random_write_wakeup_bits, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_do_rointvec, }, { .procname = "urandom_min_reseed_secs", .data = &sysctl_random_min_urandom_seed, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_do_rointvec, }, { .procname = "boot_id", |