lkml.org 
[lkml]   [2012]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 01/14] userns: Convert loop to use kuid_t instead of uid_t
    From: "Eric W. Biederman" <ebiederm@xmission.com>

    Cc: Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
    Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    drivers/block/loop.c | 4 ++--
    include/linux/loop.h | 2 +-
    init/Kconfig | 1 -
    3 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/loop.c b/drivers/block/loop.c
    index 3bba655..e9d594f 100644
    --- a/drivers/block/loop.c
    +++ b/drivers/block/loop.c
    @@ -1038,10 +1038,10 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
    {
    int err;
    struct loop_func_table *xfer;
    - uid_t uid = current_uid();
    + kuid_t uid = current_uid();

    if (lo->lo_encrypt_key_size &&
    - lo->lo_key_owner != uid &&
    + !uid_eq(lo->lo_key_owner, uid) &&
    !capable(CAP_SYS_ADMIN))
    return -EPERM;
    if (lo->lo_state != Lo_bound)
    diff --git a/include/linux/loop.h b/include/linux/loop.h
    index 11a41a8..9635116 100644
    --- a/include/linux/loop.h
    +++ b/include/linux/loop.h
    @@ -44,7 +44,7 @@ struct loop_device {
    int lo_encrypt_key_size;
    struct loop_func_table *lo_encryption;
    __u32 lo_init[2];
    - uid_t lo_key_owner; /* Who set the key */
    + kuid_t lo_key_owner; /* Who set the key */
    int (*ioctl)(struct loop_device *, int cmd,
    unsigned long arg);

    diff --git a/init/Kconfig b/init/Kconfig
    index f0371a6..f315997 100644
    --- a/init/Kconfig
    +++ b/init/Kconfig
    @@ -960,7 +960,6 @@ config UIDGID_CONVERTED
    depends on !UML || HOSTFS = n

    # The rare drivers that won't build
    - depends on BLK_DEV_LOOP = n
    depends on ANDROID_BINDER_IPC = n

    # Security modules
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-09-21 05:01    [W:2.115 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site