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

Commit 0f6ed7c2 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[PATCH] Keys: Remove incorrect and obsolete '!' operators 



The attached patch removes a couple of incorrect and obsolete '!' operators
left over from the conversion of the key permission functions from
true/false returns to zero/error returns.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 28ef3584

security/keys/keyring.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -434,7 +434,7 @@ ascend: 
		if (sp >= KEYRING_SEARCH_MAX_DEPTH)

		if (sp >= KEYRING_SEARCH_MAX_DEPTH)

			continue;

			continue;





		if (!key_task_permission(make_key_ref(key, possessed),

		if (key_task_permission(make_key_ref(key, possessed),

					context, KEY_SEARCH) < 0)

					context, KEY_SEARCH) < 0)

			continue;

			continue;
@@ -621,7 +621,7 @@ struct key *find_keyring_by_name(const char *name, key_serial_t bound) 
			if (strcmp(keyring->description, name) != 0)

			if (strcmp(keyring->description, name) != 0)

				continue;

				continue;





			if (!key_permission(make_key_ref(keyring, 0),

			if (key_permission(make_key_ref(keyring, 0),

					   KEY_SEARCH) < 0)

					   KEY_SEARCH) < 0)

				continue;

				continue;