Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd471258 authored by Xiong Zhou's avatar Xiong Zhou Committed by Greg Kroah-Hartman
Browse files

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: default avatarXiong Zhou <jencce.kernel@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 410b6372

drivers/staging/android/logger.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;

drivers/staging/android/logger.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct logger_entry { 
	__s32		tid;

	__s32		sec;

	__s32		nsec;

	uid_t		euid;

	kuid_t		euid;

	char		msg[0];

};