From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Date: Mon, 21 Jan 2019 01:25:10 +0000 (+0900)
Subject: apparmor: Adjust offset when accessing task blob.
X-Git-Tag: v5.1-rc1~69^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c2976b06f6813768d3e61aeeb2b3fb04597a25f;p=linux-block.git

apparmor: Adjust offset when accessing task blob.

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>
Fixes: f4ad8f2c4076 ("LSM: Infrastructure management of the task security")
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.morris@microsoft.com>
---

diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
index 039c1e60887a..311e652324e3 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;
 }
 
 /*