From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52ADFC4332F for ; Sun, 18 Dec 2022 18:19:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E6598E0003; Sun, 18 Dec 2022 13:19:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 420208E0001; Sun, 18 Dec 2022 13:19:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A3E28E0002; Sun, 18 Dec 2022 13:19:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1BF148E0001 for ; Sun, 18 Dec 2022 13:19:12 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D5F5812082C for ; Sun, 18 Dec 2022 18:19:11 +0000 (UTC) X-FDA: 80256238902.23.C45717E Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by imf02.hostedemail.com (Postfix) with ESMTP id A18E18000F for ; Sun, 18 Dec 2022 18:19:08 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=M2Ymm3Oz; spf=pass (imf02.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.221.50 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il; dmarc=pass (policy=none) header.from=huji.ac.il ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671387549; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jg0kRjUkHsbVldHE/ToyxuU6W5oSI6/mxVC6mkuggOI=; b=rZg0Vx3NNvU83g9gG4Psl3+ZNCdAdwif4oFPxbBifmgGQYQR2k3b5Zt9mgK7ZeQZbjw+3l y0kTeo17paqMdu0qgzofX+m3FtEZ4qgobLEJn9piPMA7+1T0jEXobMuqoiUsmtmWXIxrV3 hYLkZLi9MIYPqRRd/LkOSuXQSYXy4N8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=M2Ymm3Oz; spf=pass (imf02.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.221.50 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il; dmarc=pass (policy=none) header.from=huji.ac.il ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671387549; a=rsa-sha256; cv=none; b=ozwnE/LAkWEdqYPXATmqXcBD85ouJc39IkoJ7VVs7hhbnU5b0Tv2qFsM/nrtZdpbACcXFF LTwM8x0wCZPpO3B4/w0qYA72tMAs6AvpI/5d0gVQMHiPBttwM97hY7UchS9Y9Xu6GX+A92 899+UtofI/TwcLlHHaRzOSEpotUC59U= Received: by mail-wr1-f50.google.com with SMTP id i7so6790135wrv.8 for ; Sun, 18 Dec 2022 10:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.huji.ac.il; s=mailhuji; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jg0kRjUkHsbVldHE/ToyxuU6W5oSI6/mxVC6mkuggOI=; b=M2Ymm3OzlmHxaIpnbfofJ1RMKGA7L0CweSfRTYVTWEU6Ni0XAEKHuLIaEcWmFpQsbY jQOjpFBKtGchKShh10zl5ey+a1KSTVK5QFQ+Da9b/gvZyD2ppRvk6BalmoLkL1vRJJ7o UAq7YQm6D7tefSeuieLgpSG5p7Utu+/J/sqrw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jg0kRjUkHsbVldHE/ToyxuU6W5oSI6/mxVC6mkuggOI=; b=cJFYbKqngh6ZikOGGS/HidjY1m8Yyw8rCefKPajmm1ySkdB2eas7mGW8hB/zxKpk9w Dj39ANUTWHgN3aO2JmWMfMownguc7bYYcJ380HbN+YBgJUZkBxxXgJUaPRkXv/KFix4M uKYKRu2pk94SRerWv7amNOKWco3DYcULAGf7tVjPCCPib2IoXG6Z6jMXbf7lDk2/98Ep 3KvmAwzqVgNgawoQ+zG/gH0htdAD9DhMX5EoB1dLvQ9zxPqMly6eLblMpzGnAzkz9Z22 5vGxJh8CHORwA0HFZi38jJcNFaEDPNDFUCSK5dooL3DALbdcw8e5iQrC2OI7L3+CzZ2Q R7sQ== X-Gm-Message-State: ANoB5pkPXkh+7BovuUk6jnJK5Gaq3nJdcFm0q7cmSD5cdkUbgn6A2IlK JLZX73XoIGKA51SVS5ZQY+EO7g== X-Google-Smtp-Source: AA0mqf6mLbw8THD4/ZgFr10rOzQ/8PAMYOZrejAIYU7OuGCysRcBIowkEyxN+N6xImTtCNhFMgIlyg== X-Received: by 2002:adf:e8ce:0:b0:24c:f1ac:9a3 with SMTP id k14-20020adfe8ce000000b0024cf1ac09a3mr20078504wrn.27.1671387547014; Sun, 18 Dec 2022 10:19:07 -0800 (PST) Received: from MacBook-Pro-6.lan ([2a0d:6fc2:218c:1a00:c45e:1c4b:fab4:ee34]) by smtp.gmail.com with ESMTPSA id b13-20020a05600003cd00b0024cb961b6aesm7956489wrg.104.2022.12.18.10.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 10:19:06 -0800 (PST) From: david.keisarschm@mail.huji.ac.il To: linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Jason@zx2c4.com, David Keisar Schmidt , aksecurity@gmail.com, ilay.bahat1@gmail.com, linux-mm@kvack.org Subject: [PATCH v3 1/3] Replace invocation of weak PRNG in mm/slab.c Date: Sun, 18 Dec 2022 20:18:58 +0200 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 4o5y8o8de6r43okunah589te4xc18qb1 X-Rspam-User: X-Rspamd-Queue-Id: A18E18000F X-Rspamd-Server: rspam06 X-HE-Tag: 1671387548-258209 X-HE-Meta: U2FsdGVkX18sADUWOy8sCEOC4/zb+1mnZf2bvay/cNT1q6w8jh/G97PL2EKYyrBce1ycKuWBSv4G1TFRp8gloS5jralwWvWviQkn/T1rkB+gyranY8JoUH9T3ppKOjwks3f7KUhZlyyPMWbLCbCZBSXWlX6vhb0xudX2qy0o5qRf1pta0CNsw9vYDH57NC6XRndfNHud1xdLGHKCwknsYBBXoO+Z1Lb0ZDDdfnZZ2iOocVTTg64bFoUl/NiIC0QefrGSXXYxaLYL2aoy/2GHmdjBnsGbosBcG1Hqv6VhjV8tNg4pCKzUc+X4ddeHl3c9CT5q6XCM8BKCP2RGo1Go4e164ok4QAYdpqytfuZeOvFeBMUCWjeFOVysIj/WjuUw1ab3eQv7a/UhBynXy+0thsXu5Dkj7arINM0KCPXv50WWG5gSAGtamDVNcEhA4WSDHrYhM4jFtjyvcjmlNDMpC31xEXeHQhyqdCiKJjanWWXYRUrZd3yIyimh40kCSOhTySXXC+/fbDfAzI+qgSwMxhJs1cZXz7huo3WIizseR/O1cA3IVXijB56A2l0UzbzD3hb2o1UqoO+IxtrG22KAlK7cOQlc6zRZGFuJxlSQqh1QS5S/3CWyw0jYbM82pzOGSOsKzgB5EA2uQPtv5kZktzzYWHKQeXaHzswu/VXK7Ge6U9KK/ZhGLrkeaISJkYZ08Ab+Gv+8V6AfG0MclXmVNAzXuRA/ndYmnodOl3BpM5YeJgEiq98ZIXMXRvsq/oGRMlZfvkVzMy+wv7x8qvF1+Gi1xibFBxutB/Yuit1VYRnmxiZ0l8/o/qKR5zoLRcWnSAl8k6EON+fF2c47MprQqPWNr+AYRN4Z4OmWOXEzprru7AM9Vy1SwvnmeDpJ9xPBUsDca1m2Z2V0JV3yYcUg/jgKBgfA8/S1dRoBnsIxBQKN67U9lEg+cqO0FD96moQSoQRy6OjGjlzKGPDwqxK VYmEAXwP T/ReanKHJIXZHOgMrvUzdqyKtOLsMO2FAFY0tLIdn678KvwXfkhgS/dU4HfxUKdlliCAq24E7xjWTeXe9zwAVmZMlYVvDZlG++Ns1cMd9BJk7FqGVvycE9sywyMUDEFpQa5PRv5/7QoZt4hxXiRSFPSkS6OdOOZ77kUHC5I0FthQQ2lI888E3nkH5V+cchFGUnNAdmTKnxUy98QCG5o6o4DEqZQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: David Keisar Schmidt This third series add some changes to the commit messages, and also replaces get_random_u32 with get_random_u32_below, in a case a modulo operation is done on the result. The Slab allocator randomization uses the prandom_u32 PRNG. That was added to prevent attackers to obtain information on the heap state, by randomizing the freelists state. However, this PRNG turned out to be weak, as noted in commit c51f8f88d705 To fix it, we have changed the invocation of prandom_u32_state to get_random_u32 to ensure the PRNG is strong. Since a modulo operation is applied right after that, we used get_random_u32_below, to achieve uniformity. In addition, we changed the freelist_init_state union to struct, since the rnd_state inside which is used to store the state of prandom_u32, is not needed anymore, since get_random_u32 maintains its own state. # Changes since v2 * edited commit message. * replaced instances of get_random_u32 with get_random_u32_below in mm/slab.c. Signed-off-by: David Keisar Schmidt --- mm/slab.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 59c8e28f7..c259e0b09 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2360,20 +2360,17 @@ static void cache_init_objs_debug(struct kmem_cache *cachep, struct slab *slab) #ifdef CONFIG_SLAB_FREELIST_RANDOM /* Hold information during a freelist initialization */ -union freelist_init_state { - struct { - unsigned int pos; - unsigned int *list; - unsigned int count; - }; - struct rnd_state rnd_state; +struct freelist_init_state { + unsigned int pos; + unsigned int *list; + unsigned int count; }; /* * Initialize the state based on the randomization method available. * return true if the pre-computed list is available, false otherwise. */ -static bool freelist_state_initialize(union freelist_init_state *state, +static bool freelist_state_initialize(struct freelist_init_state *state, struct kmem_cache *cachep, unsigned int count) { @@ -2381,23 +2378,22 @@ static bool freelist_state_initialize(union freelist_init_state *state, unsigned int rand; /* Use best entropy available to define a random shift */ - rand = get_random_u32(); + rand = get_random_u32_below(count); /* Use a random state if the pre-computed list is not available */ if (!cachep->random_seq) { - prandom_seed_state(&state->rnd_state, rand); ret = false; } else { state->list = cachep->random_seq; state->count = count; - state->pos = rand % count; + state->pos = rand; ret = true; } return ret; } /* Get the next entry on the list and randomize it using a random shift */ -static freelist_idx_t next_random_slot(union freelist_init_state *state) +static freelist_idx_t next_random_slot(struct freelist_init_state *state) { if (state->pos >= state->count) state->pos = 0; @@ -2418,7 +2414,7 @@ static void swap_free_obj(struct slab *slab, unsigned int a, unsigned int b) static bool shuffle_freelist(struct kmem_cache *cachep, struct slab *slab) { unsigned int objfreelist = 0, i, rand, count = cachep->num; - union freelist_init_state state; + struct freelist_init_state state; bool precomputed; if (count < 2) @@ -2447,8 +2443,7 @@ static bool shuffle_freelist(struct kmem_cache *cachep, struct slab *slab) /* Fisher-Yates shuffle */ for (i = count - 1; i > 0; i--) { - rand = prandom_u32_state(&state.rnd_state); - rand %= (i + 1); + rand = get_random_u32_below(i+1); swap_free_obj(slab, i, rand); } } else { -- 2.38.0