lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 130/237] random: dont let 644 read-only sysctls be written to
    Date
    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    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>
    ---
    drivers/char/random.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/char/random.c
    +++ b/drivers/char/random.c
    @@ -1662,6 +1662,13 @@ static int proc_do_uuid(struct ctl_table
    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",

    \
     
     \ /
      Last update: 2022-06-23 19:34    [W:8.881 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site