| Message ID | 20120330202007.GD8020@outflux.net |
|---|---|
| State | New |
| Headers | show |
Applied to Precise master-next. Thanks, Leann On Fri, 2012-03-30 at 13:20 -0700, Kees Cook wrote: > 3.4-rc1 contains new prctl values that conflict with the ones chosen for > nnp, so push them forward with the hopes that we will align with the future. > > Signed-off-by: Kees Cook <kees@ubuntu.com> > --- > include/linux/prctl.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/prctl.h b/include/linux/prctl.h > index c2f1f17..8593c71 100644 > --- a/include/linux/prctl.h > +++ b/include/linux/prctl.h > @@ -133,7 +133,7 @@ > * asking selinux for a specific new context (e.g. with runcon) will result > * in execve returning -EPERM. > */ > -#define PR_SET_NO_NEW_PRIVS 36 > -#define PR_GET_NO_NEW_PRIVS 37 > +#define PR_SET_NO_NEW_PRIVS 38 > +#define PR_GET_NO_NEW_PRIVS 39 > > #endif /* _LINUX_PRCTL_H */ > -- > 1.7.0.4 > > -- > Kees Cook >
diff --git a/include/linux/prctl.h b/include/linux/prctl.h index c2f1f17..8593c71 100644 --- a/include/linux/prctl.h +++ b/include/linux/prctl.h @@ -133,7 +133,7 @@ * asking selinux for a specific new context (e.g. with runcon) will result * in execve returning -EPERM. */ -#define PR_SET_NO_NEW_PRIVS 36 -#define PR_GET_NO_NEW_PRIVS 37 +#define PR_SET_NO_NEW_PRIVS 38 +#define PR_GET_NO_NEW_PRIVS 39 #endif /* _LINUX_PRCTL_H */
3.4-rc1 contains new prctl values that conflict with the ones chosen for nnp, so push them forward with the hopes that we will align with the future. Signed-off-by: Kees Cook <kees@ubuntu.com> --- include/linux/prctl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)