OSDN Git Service

staging: gasket: core: use bool type for ns_capable result
authorTodd Poynor <toddpoynor@google.com>
Tue, 31 Jul 2018 20:24:46 +0000 (13:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Aug 2018 18:07:03 +0000 (20:07 +0200)
When gasket core was converted from using capable() to use ns_capable()
instead, the type of the variable holding the result should have been
converted from int to bool.

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gasket/gasket_core.c

index 4434452..f76f4a0 100644 (file)
@@ -1191,7 +1191,7 @@ static int gasket_open(struct inode *inode, struct file *filp)
        struct gasket_cdev_info *dev_info =
            container_of(inode->i_cdev, struct gasket_cdev_info, cdev);
        struct pid_namespace *pid_ns = task_active_pid_ns(current);
-       int is_root = ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN);
+       bool is_root = ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN);
 
        gasket_dev = dev_info->gasket_dev_ptr;
        driver_desc = gasket_dev->internal_desc->driver_desc;
@@ -1270,7 +1270,7 @@ static int gasket_release(struct inode *inode, struct file *file)
        struct gasket_cdev_info *dev_info =
                container_of(inode->i_cdev, struct gasket_cdev_info, cdev);
        struct pid_namespace *pid_ns = task_active_pid_ns(current);
-       int is_root = ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN);
+       bool is_root = ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN);
 
        gasket_dev = dev_info->gasket_dev_ptr;
        driver_desc = gasket_dev->internal_desc->driver_desc;