From: Todd Poynor <toddpoy...@google.com>

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 <d...@chromium.org>
Signed-off-by: Todd Poynor <toddpoy...@google.com>
---
 drivers/staging/gasket/gasket_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/gasket/gasket_core.c 
b/drivers/staging/gasket/gasket_core.c
index 44344528cd88..f76f4a0ecbac 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -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;
-- 
2.18.0.345.g5c9ce644c3-goog

Reply via email to