aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>2019-01-21 10:25:10 +0900
committerJames Morris <james.morris@microsoft.com>2019-01-22 14:38:59 -0800
commit6c2976b06f6813768d3e61aeeb2b3fb04597a25f (patch)
tree06f1967cb7b9121245dbc8cbb8230840d72682dd /security/apparmor
parentMerge tag 'v5.0-rc3' into next-general (diff)
downloadlinux-dev-6c2976b06f6813768d3e61aeeb2b3fb04597a25f.tar.xz
linux-dev-6c2976b06f6813768d3e61aeeb2b3fb04597a25f.zip
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>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/include/task.h2
1 files changed, 1 insertions, 1 deletions
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;
}
/*