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

Commit 87302700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  TOMOYO: Fix incomplete read of /sys/kernel/security/tomoyo/profile
parents 5c723ba5 4d818971

security/tomoyo/common.c

+4 −1
Original line number Diff line number Diff line
@@ -710,8 +710,10 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head) 
		      head->r.index++)

			if (ns->profile_ptr[head->r.index])

				break;

		if (head->r.index == TOMOYO_MAX_PROFILES)

		if (head->r.index == TOMOYO_MAX_PROFILES) {

			head->r.eof = true;

			return;

		}

		head->r.step++;

		break;

	case 2:
@@ -723,6 +725,7 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head) 
			tomoyo_io_printf(head, "%u-COMMENT=", index);

			tomoyo_set_string(head, comment ? comment->name : "");

			tomoyo_set_lf(head);

			tomoyo_print_namespace(head);

			tomoyo_io_printf(head, "%u-PREFERENCE={ ", index);

			for (i = 0; i < TOMOYO_MAX_PREF; i++)

				tomoyo_io_printf(head, "%s=%u ",