diff mbox series

apparmor: Adjust offset when accessing task blob.

Message ID 201901210125.x0L1PAwO046352@www262.sakura.ne.jp (mailing list archive)
State New, archived
Headers show
Series apparmor: Adjust offset when accessing task blob. | expand

Commit Message

Tetsuo Handa Jan. 21, 2019, 1:25 a.m. UTC
AppArmor will no longer be the only user of task blob
after TOMOYO started using task blob.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
 security/apparmor/include/task.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kees Cook Jan. 22, 2019, 5:41 p.m. UTC | #1
On Mon, Jan 21, 2019 at 10:25:10AM +0900, Tetsuo Handa wrote:
> AppArmor will no longer be the only user of task blob
> after TOMOYO started using task blob.
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

I just noticed this today too! You beat me to sending the patch. ;)

Fixes: f4ad8f2c4076 ("LSM: Infrastructure management of the task security")
Acked-by: Kees Cook <keescook@chromium.org>

James, this should get into v5.0 fixes tree.

-Kees

> ---
>  security/apparmor/include/task.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
> index 039c1e6..311e652 100644
> --- a/security/apparmor/include/task.h
> +++ b/security/apparmor/include/task.h
> @@ -16,7 +16,7 @@
>  
>  static inline struct aa_task_ctx *task_ctx(struct task_struct *task)
>  {
> -	return task->security;
> +	return task->security + apparmor_blob_sizes.lbs_task;
>  }
>  
>  /*
> -- 
> 1.8.3.1
James Morris Jan. 22, 2019, 10:41 p.m. UTC | #2
On Mon, 21 Jan 2019, Tetsuo Handa wrote:

> AppArmor will no longer be the only user of task blob
> after TOMOYO started using task blob.
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> ---

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general
diff mbox series

Patch

diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
index 039c1e6..311e652 100644
--- a/security/apparmor/include/task.h
+++ b/security/apparmor/include/task.h
@@ -16,7 +16,7 @@ 
 
 static inline struct aa_task_ctx *task_ctx(struct task_struct *task)
 {
-	return task->security;
+	return task->security + apparmor_blob_sizes.lbs_task;
 }
 
 /*