diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/security.c | 1 | ||||
-rw-r--r-- | security/tomoyo/common.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index c1d69875db6c..0c6cc69c8f86 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -1151,6 +1151,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk) | |||
1151 | { | 1151 | { |
1152 | security_ops->sk_clone_security(sk, newsk); | 1152 | security_ops->sk_clone_security(sk, newsk); |
1153 | } | 1153 | } |
1154 | EXPORT_SYMBOL(security_sk_clone); | ||
1154 | 1155 | ||
1155 | void security_sk_classify_flow(struct sock *sk, struct flowi *fl) | 1156 | void security_sk_classify_flow(struct sock *sk, struct flowi *fl) |
1156 | { | 1157 | { |
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index d41900de8a69..150911c7ff08 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c | |||
@@ -748,8 +748,10 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head) | |||
748 | head->r.index++) | 748 | head->r.index++) |
749 | if (ns->profile_ptr[head->r.index]) | 749 | if (ns->profile_ptr[head->r.index]) |
750 | break; | 750 | break; |
751 | if (head->r.index == TOMOYO_MAX_PROFILES) | 751 | if (head->r.index == TOMOYO_MAX_PROFILES) { |
752 | head->r.eof = true; | ||
752 | return; | 753 | return; |
754 | } | ||
753 | head->r.step++; | 755 | head->r.step++; |
754 | break; | 756 | break; |
755 | case 2: | 757 | case 2: |
@@ -761,6 +763,7 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head) | |||
761 | tomoyo_io_printf(head, "%u-COMMENT=", index); | 763 | tomoyo_io_printf(head, "%u-COMMENT=", index); |
762 | tomoyo_set_string(head, comment ? comment->name : ""); | 764 | tomoyo_set_string(head, comment ? comment->name : ""); |
763 | tomoyo_set_lf(head); | 765 | tomoyo_set_lf(head); |
766 | tomoyo_print_namespace(head); | ||
764 | tomoyo_io_printf(head, "%u-PREFERENCE={ ", index); | 767 | tomoyo_io_printf(head, "%u-PREFERENCE={ ", index); |
765 | for (i = 0; i < TOMOYO_MAX_PREF; i++) | 768 | for (i = 0; i < TOMOYO_MAX_PREF; i++) |
766 | tomoyo_io_printf(head, "%s=%u ", | 769 | tomoyo_io_printf(head, "%s=%u ", |