Skip to content

Commit

Permalink
staging: android: logger: use kuid_t instead of uid_t
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Xiong Zhou authored and Greg Kroah-Hartman committed May 16, 2013
1 parent 410b637 commit bd47125
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/android/logger.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static ssize_t do_read_log_to_user(struct logger_log *log,
* 'log->buffer' which contains the first entry readable by 'euid'
*/
static size_t get_next_entry_by_uid(struct logger_log *log,
size_t off, uid_t euid)
size_t off, kuid_t euid)
{
while (off != log->w_off) {
struct logger_entry *entry;
Expand All @@ -251,7 +251,7 @@ static size_t get_next_entry_by_uid(struct logger_log *log,

entry = get_entry_header(log, off, &scratch);

if (entry->euid == euid)
if (uid_eq(entry->euid, euid))
return off;

next_len = sizeof(struct logger_entry) + entry->len;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/android/logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ struct logger_entry {
__s32 tid;
__s32 sec;
__s32 nsec;
uid_t euid;
kuid_t euid;
char msg[0];
};

Expand Down

0 comments on commit bd47125

Please sign in to comment.