linux-kernel - Subject: [PATCH] mm/slab: trivial change to replace round-up code with ALIGN

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: <20170616072918epcms5p4ff16c24ef8472b4c3b4371823cd87856@epcms5p4>
Date:   Fri, 16 Jun 2017 07:29:18 +0000
From:   陆灿江 <canjiang.lu@...sung.com>
To:     "trivial@...nel.org" <trivial@...nel.org>
CC:     "cl@...ux.comPekka" <cl@...ux.comPekka>,
        "penberg@...nel.orgDavid" <penberg@...nel.orgDavid>,
        "rientjes@...gle.comJoonsoo" <rientjes@...gle.comJoonsoo>,
        "iamjoonsoo.kim@....comAndrew" <iamjoonsoo.kim@....comAndrew>,
        "akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
        杨伟杰 <weijie.yang@...sung.com>,
        "mm-commits@...r.kernel.org" <mm-commits@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Subject: [PATCH] mm/slab: trivial change to replace round-up code
 with ALIGN

This patch makes use of ALIGN() to remove duplicate round-up code.

Signed-off-by: Canjiang Lu <canjiang.lu@...sung.com>
---
 mm/slab.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 807d86c..69e08a4 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2040,17 +2040,13 @@ static bool set_on_slab_cache(struct kmem_cache *cachep,
 	 * unaligned accesses for some archs when redzoning is used, and makes
 	 * sure any on-slab bufctl's are also correctly aligned.
 	 */
-	if (size & (BYTES_PER_WORD - 1)) {
-		size += (BYTES_PER_WORD - 1);
-		size &= ~(BYTES_PER_WORD - 1);
-	}
+	size = ALIGN(size, BYTES_PER_WORD);
 
 	if (flags & SLAB_RED_ZONE) {
 		ralign = REDZONE_ALIGN;
 		/* If redzoning, ensure that the second redzone is suitably
 		 * aligned, by adjusting the object size accordingly. */
-		size += REDZONE_ALIGN - 1;
-		size &= ~(REDZONE_ALIGN - 1);
+		size = ALIGN(size, REDZONE_ALIGN);
 	}
 
 	/* 3) caller mandated alignment */
-- 
1.9.1