From patchwork Fri Mar 30 20:20:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 149747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id F09EBB6FA4 for ; Sat, 31 Mar 2012 07:20:15 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SDiIr-0003mG-Nf; Fri, 30 Mar 2012 20:20:09 +0000 Received: from smtp.outflux.net ([198.145.64.163]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SDiIq-0003mA-1m for kernel-team@lists.ubuntu.com; Fri, 30 Mar 2012 20:20:08 +0000 Received: from www.outflux.net (serenity-end.outflux.net [10.2.0.2]) by vinyl.outflux.net (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id q2UKK7DZ019790 for ; Fri, 30 Mar 2012 13:20:07 -0700 Date: Fri, 30 Mar 2012 13:20:07 -0700 From: Kees Cook To: kernel-team@lists.ubuntu.com Subject: [Precise][PATCH 2/2] UBUNTU: SAUCE: SECCOMP: adjust prctl constant Message-ID: <20120330202007.GD8020@outflux.net> MIME-Version: 1.0 Content-Disposition: inline Organization: Ubuntu X-MIMEDefang-Filter: outflux$Revision: 1.316 $ X-HELO: www.outflux.net X-Scanned-By: MIMEDefang 2.71 on 10.2.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- 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 */