linux-kernel - [PATCH] Revert "MIPS: Fix PAGE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20160122172037.23041.29693.stgit@dwillia2-desk3.amr.corp.intel.com>
Date:	Fri, 22 Jan 2016 09:20:37 -0800
From:	Dan Williams <dan.j.williams@...el.com>
To:	linux-kernel@...r.kernel.org
Cc:	Linux-MIPS <linux-mips@...ux-mips.org>, stable@...r.kernel.org,
	Ralf Baechle <ralf@...ux-mips.org>,
	Manuel Lauss <manuel.lauss@...il.com>
Subject: [PATCH] Revert "MIPS: Fix PAGE_MASK definition"

This reverts commit 22b14523994588279ae9c5ccfe64073c1e5b3c00.

It was originally sent in an earlier revision of the pfn_t patchset.
Besides being broken, the warning is also fixed by PFN_FLAGS_MASK
casting the PAGE_MASK to an unsigned long.

Cc: <stable@...r.kernel.org>
Cc: Ralf Baechle <ralf@...ux-mips.org>
Cc: Linux-MIPS <linux-mips@...ux-mips.org>
Reported-by: Manuel Lauss <manuel.lauss@...il.com>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
 arch/mips/include/asm/page.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
index 2046c0230224..21ed7150fec3 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -33,7 +33,7 @@
 #define PAGE_SHIFT	16
 #endif
 #define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
-#define PAGE_MASK	(~(PAGE_SIZE - 1))
+#define PAGE_MASK	(~((1 << PAGE_SHIFT) - 1))
 
 /*
  * This is used for calculating the real page sizes