diff options
author | Xiong Zhou <jencce.kernel@gmail.com> | 2013-05-08 06:52:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 18:37:51 -0400 |
commit | bd471258f2e0911f29d5dc3e1689de35518a157a (patch) | |
tree | 8958c68afa31ca48ada7c2d6a60610f84c8b2728 | |
parent | 410b6372d780da3e3594bc107139af9d049d3ac5 (diff) |
staging: android: logger: use kuid_t instead of uid_t
Use kuid_t instead of uid_t, to pass the UIDGID_STRICT_TYPE_CHECKS.
Signed-off-by: Xiong Zhou <jencce.kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/logger.c | 4 | ||||
-rw-r--r-- | drivers/staging/android/logger.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index b040200a5a55..9bd874789ce5 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c | |||
@@ -242,7 +242,7 @@ static ssize_t do_read_log_to_user(struct logger_log *log, | |||
242 | * 'log->buffer' which contains the first entry readable by 'euid' | 242 | * 'log->buffer' which contains the first entry readable by 'euid' |
243 | */ | 243 | */ |
244 | static size_t get_next_entry_by_uid(struct logger_log *log, | 244 | static size_t get_next_entry_by_uid(struct logger_log *log, |
245 | size_t off, uid_t euid) | 245 | size_t off, kuid_t euid) |
246 | { | 246 | { |
247 | while (off != log->w_off) { | 247 | while (off != log->w_off) { |
248 | struct logger_entry *entry; | 248 | struct logger_entry *entry; |
@@ -251,7 +251,7 @@ static size_t get_next_entry_by_uid(struct logger_log *log, | |||
251 | 251 | ||
252 | entry = get_entry_header(log, off, &scratch); | 252 | entry = get_entry_header(log, off, &scratch); |
253 | 253 | ||
254 | if (entry->euid == euid) | 254 | if (uid_eq(entry->euid, euid)) |
255 | return off; | 255 | return off; |
256 | 256 | ||
257 | next_len = sizeof(struct logger_entry) + entry->len; | 257 | next_len = sizeof(struct logger_entry) + entry->len; |
diff --git a/drivers/staging/android/logger.h b/drivers/staging/android/logger.h index cc6bbd99c8e0..70af7d805dff 100644 --- a/drivers/staging/android/logger.h +++ b/drivers/staging/android/logger.h | |||
@@ -66,7 +66,7 @@ struct logger_entry { | |||
66 | __s32 tid; | 66 | __s32 tid; |
67 | __s32 sec; | 67 | __s32 sec; |
68 | __s32 nsec; | 68 | __s32 nsec; |
69 | uid_t euid; | 69 | kuid_t euid; |
70 | char msg[0]; | 70 | char msg[0]; |
71 | }; | 71 | }; |
72 | 72 | ||