diff mbox

[3.16.y-ckt,stable] Patch "security: fix typo in security_task_prctl" has been added to staging queue

Message ID 1447346794-30853-1-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques Nov. 12, 2015, 4:46 p.m. UTC
This is a note to let you know that I have just added a patch titled

    security: fix typo in security_task_prctl

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt20.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From 3dbde9cc2f0fd4c3996c50e5497618c78f9d63f1 Mon Sep 17 00:00:00 2001
From: Jann Horn <jann@thejh.net>
Date: Fri, 18 Sep 2015 23:41:23 +0200
Subject: security: fix typo in security_task_prctl

commit b7f76ea2ef6739ee484a165ffbac98deb855d3d3 upstream.

Signed-off-by: Jann Horn <jann@thejh.net>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 include/linux/security.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andy Lutomirski Nov. 12, 2015, 5:33 p.m. UTC | #1
On Thu, Nov 12, 2015 at 8:46 AM, Luis Henriques
<luis.henriques@canonical.com> wrote:
> This is a note to let you know that I have just added a patch titled
>
>     security: fix typo in security_task_prctl
>
> to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
> which can be found at:
>
>     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue
>
> This patch is scheduled to be released in version 3.16.7-ckt20.

FWIW, this patch fixes a bug in ambient capabilities, which are new in
4.3.  I'm not aware of any other observable effect of this patch at
all, so as far as I know, it doesn't fix an actual bug in older
kernels.

It's Obviously Correct (TM), but it could be safely omitted from these trees.

--Andy
Luis Henriques Nov. 12, 2015, 5:52 p.m. UTC | #2
On Thu, Nov 12, 2015 at 09:33:59AM -0800, Andy Lutomirski wrote:
> On Thu, Nov 12, 2015 at 8:46 AM, Luis Henriques
> <luis.henriques@canonical.com> wrote:
> > This is a note to let you know that I have just added a patch titled
> >
> >     security: fix typo in security_task_prctl
> >
> > to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
> > which can be found at:
> >
> >     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue
> >
> > This patch is scheduled to be released in version 3.16.7-ckt20.
> 
> FWIW, this patch fixes a bug in ambient capabilities, which are new in
> 4.3.  I'm not aware of any other observable effect of this patch at
> all, so as far as I know, it doesn't fix an actual bug in older
> kernels.
> 
> It's Obviously Correct (TM), but it could be safely omitted from these trees.

Great, thanks.  I'll just drop the patch from the 3.16 queue.

Cheers,
--
Luís
diff mbox

Patch

diff --git a/include/linux/security.h b/include/linux/security.h
index 9c6b9722ff48..9c201a9dddca 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2454,7 +2454,7 @@  static inline int security_task_prctl(int option, unsigned long arg2,
 				      unsigned long arg4,
 				      unsigned long arg5)
 {
-	return cap_task_prctl(option, arg2, arg3, arg3, arg5);
+	return cap_task_prctl(option, arg2, arg3, arg4, arg5);
 }

 static inline void security_task_to_inode(struct task_struct *p, struct inode *inode)