[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20180715184336.195821-1-toddpoynor@gmail.com>
Date: Sun, 15 Jul 2018 11:43:36 -0700
From: Todd Poynor <toddpoynor@...il.com>
To: Rob Springer <rspringer@...gle.com>,
John Joseph <jnjoseph@...gle.com>,
Ben Chan <benchan@...omium.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Zhongze Hu <frankhu@...omium.org>, Simon Que <sque@...omium.org>,
Dmitry Torokhov <dtor@...omium.org>,
Guenter Roeck <groeck@...omium.org>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Todd Poynor <toddpoynor@...gle.com>
Subject: [PATCH resend] staging: gasket: convert gasket_mmap_has_permissions to bool return
From: Todd Poynor <toddpoynor@...gle.com>
gasket_mmap_has_permissions() should return a boolean value.
Signed-off-by: Zhongze Hu <frankhu@...omium.org>
Signed-off-by: Todd Poynor <toddpoynor@...gle.com>
---
drivers/staging/gasket/gasket_core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 4ac239c33ea3..dd2daa2e1c31 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -1232,19 +1232,19 @@ static int gasket_release(struct inode *inode, struct file *file)
* that the provided descriptor/range is of adequate size to hold the range to
* be mapped.
*/
-static int gasket_mmap_has_permissions(
+static bool gasket_mmap_has_permissions(
struct gasket_dev *gasket_dev, struct vm_area_struct *vma,
int bar_permissions)
{
int requested_permissions;
/* Always allow sysadmin to access. */
if (capable(CAP_SYS_ADMIN))
- return 1;
+ return true;
/* Never allow non-sysadmins to access to a dead device. */
if (gasket_dev->status != GASKET_STATUS_ALIVE) {
gasket_log_info(gasket_dev, "Device is dead.");
- return 0;
+ return false;
}
/* Make sure that no wrong flags are set. */
@@ -1256,7 +1256,7 @@ static int gasket_mmap_has_permissions(
"Attempting to map a region with requested permissions "
"0x%x, but region has permissions 0x%x.",
requested_permissions, bar_permissions);
- return 0;
+ return false;
}
/* Do not allow a non-owner to write. */
@@ -1266,10 +1266,10 @@ static int gasket_mmap_has_permissions(
gasket_dev,
"Attempting to mmap a region for write without owning "
"device.");
- return 0;
+ return false;
}
- return 1;
+ return true;
}
/*
--
2.18.0.203.gfac676dfb9-goog
Resending, extracted from the previous stack of patches that needs
other cleanups.
Powered by blists - more mailing lists