From patchwork Fri Jan 24 14:17:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 313909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id E18752C009C for ; Sat, 25 Jan 2014 01:17:47 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1W6hZn-0000to-Mc; Fri, 24 Jan 2014 14:17:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1W6hZe-0000ry-3Q for kernel-team@lists.ubuntu.com; Fri, 24 Jan 2014 14:17:34 +0000 Received: from bl15-146-215.dsl.telepac.pt ([188.80.146.215] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1W6hZd-0006Rf-T4 for kernel-team@lists.ubuntu.com; Fri, 24 Jan 2014 14:17:34 +0000 From: Luis Henriques To: kernel-team@lists.ubuntu.com Subject: [Lucid][CVE-2013-0160][PATCH v2 4/7] fanotify: FMODE_NONOTIFY and __O_SYNC in sparc conflict Date: Fri, 24 Jan 2014 14:17:22 +0000 Message-Id: <1390573045-10067-5-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1390573045-10067-1-git-send-email-luis.henriques@canonical.com> References: <1390573045-10067-1-git-send-email-luis.henriques@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: "Signed-off-by: Wu Fengguang" CVE-2013-0160 BugLink: http://bugs.launchpad.net/bugs/1097680 sparc used the same value as FMODE_NONOTIFY so change FMODE_NONOTIFY to be something unique. Signed-off-by: Wu Fengguang Signed-off-by: Eric Paris (cherry picked from commit 12ed2e36c98aec6c41559222e311f4aa15d254b6) Signed-off-by: Luis Henriques --- include/asm-generic/fcntl.h | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index c8ba134..aeef057 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h @@ -5,7 +5,7 @@ /* * FMODE_EXEC is 0x20 - * FMODE_NONOTIFY is 0x800000 + * FMODE_NONOTIFY is 0x1000000 * These cannot be used by userspace O_* until internal and external open * flags are split. * -Eric Paris diff --git a/include/linux/fs.h b/include/linux/fs.h index 42f714f..34cb8c5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -92,7 +92,7 @@ struct inodes_stat_t { #define FMODE_RANDOM ((__force fmode_t)4096) /* File was opened by fanotify and shouldn't generate fanotify events */ -#define FMODE_NONOTIFY ((__force fmode_t)8388608) +#define FMODE_NONOTIFY ((__force fmode_t)16777216) /* 0x1000000 */ /* * The below are the various read and write types that we support. Some of