From patchwork Wed Apr 25 19:52:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Conklin X-Patchwork-Id: 155088 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 ADF66B6FE1 for ; Thu, 26 Apr 2012 05:53:28 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SN8HA-0007nF-IL; Wed, 25 Apr 2012 19:53:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SN8H7-0007nA-R3 for kernel-team@lists.ubuntu.com; Wed, 25 Apr 2012 19:53:17 +0000 Received: from user-69-73-1-154.knology.net ([69.73.1.154] helo=[172.31.0.160]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1SN8H7-0004wx-MZ for kernel-team@lists.ubuntu.com; Wed, 25 Apr 2012 19:53:17 +0000 Message-ID: <4F98561A.8030708@canonical.com> Date: Wed, 25 Apr 2012 14:52:58 -0500 From: Steve Conklin User-Agent: Mozilla/5.0 (X11; Linux i686; rv:11.0) Gecko/20120411 Thunderbird/11.0.1 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: Re: [CVE-2012-2123] natty security: fix compile error in commoncap.c References: <4F972329.60400@canonical.com> In-Reply-To: <4F972329.60400@canonical.com> X-Enigmail-Version: 1.4 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 This is a backport from upstream, Serge pointed out that the earlier CVE patch causes a failure to build on some architectures, but I didn't run into it in my testing. This patch should be applied after the previous one for CVE-2012-2123. From 31d0888fc648d4a5a54b676570cbe9b65bcfcf4b Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Wed, 18 Apr 2012 17:23:04 -0400 Subject: [PATCH] security: fix compile error in commoncap.c CVE-2012-2123 BugLink: http://bugs.launchpad.net/bugs/987571 Add missing "personality.h" security/commoncap.c: In function 'cap_bprm_set_creds': security/commoncap.c:510: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function) security/commoncap.c:510: error: (Each undeclared identifier is reported only once security/commoncap.c:510: error: for each function it appears in.) Signed-off-by: Jonghwan Choi Acked-by: Serge Hallyn Signed-off-by: James Morris (cherry picked from commit 51b79bee627d52 with adjustment) Signed-off-by: Steve Conklin --- security/commoncap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/security/commoncap.c b/security/commoncap.c index 0acd490..7f239ff 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -27,6 +27,7 @@ #include #include #include +#include /* * If a non-root user executes a setuid-root binary in