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 6F801C77B70 for ; Sat, 15 Apr 2023 17:36:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDA466B0075; Sat, 15 Apr 2023 13:36:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8A306B0078; Sat, 15 Apr 2023 13:36:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A51DF6B007B; Sat, 15 Apr 2023 13:36:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 937896B0075 for ; Sat, 15 Apr 2023 13:36:39 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 60CAA80216 for ; Sat, 15 Apr 2023 17:36:39 +0000 (UTC) X-FDA: 80684330118.13.45421F5 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by imf01.hostedemail.com (Postfix) with ESMTP id 6DEB94000D for ; Sat, 15 Apr 2023 17:36:37 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=X+bgruq6; dmarc=pass (policy=none) header.from=huji.ac.il; spf=pass (imf01.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.128.41 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681580197; 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:references:dkim-signature; bh=tywA8rmVIJzBGfSKBGfQ/D1/dGwROMgtT/yYwruYZtg=; b=4JU014vXCsLMILNVQp3Znlk1CK5pkq01VLCLiTH4oiAR4ArVkAFR9p8wZJZ9CJ+48ANTFR DdK774sS/AlsTG1Q1frzVvxW1xtNNZrZqr+RiCZ3TEmJ70h8oyJ+wGAyaNN2HUR36pe2cB d2UyYwmgYfcUkQxxya09DqIq+MieXNI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=X+bgruq6; dmarc=pass (policy=none) header.from=huji.ac.il; spf=pass (imf01.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.128.41 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681580197; a=rsa-sha256; cv=none; b=tikfW2kkVpxbmtyWPRc+B454y00R/jJkBQpbap80WFiiXAD2QqNaa/YxnYiyJLs4zwtos1 pGrBOcMuIQAk8NuMvLA4gy0NaBAybCsRi9qPZlVA+bo/67n7OGjt9BPpGgF6OuelkQ+yRH SkQo5ixInzalZTbaQrhQyd0vA/b4JS0= Received: by mail-wm1-f41.google.com with SMTP id eo6-20020a05600c82c600b003ee5157346cso13408218wmb.1 for ; Sat, 15 Apr 2023 10:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.huji.ac.il; s=mailhuji; t=1681580196; x=1684172196; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tywA8rmVIJzBGfSKBGfQ/D1/dGwROMgtT/yYwruYZtg=; b=X+bgruq6dNzBiAoOzk73n13dkmLGsZTRPczDLborRgY8ILMNsH+k2EQianqKzoF3Ds EiXqmlR8iAP970UTDyw9xkiSXJLirO4/JRe+3eArCawKufVwYuhiC101IV7hxygx8mB9 qfN//B2ITyw8OyXJ6g970zP6I77vwk1n/WO80= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681580196; x=1684172196; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tywA8rmVIJzBGfSKBGfQ/D1/dGwROMgtT/yYwruYZtg=; b=Aqcnr8bL/binZYMHaaLWpj+dxEuyRjX9AnE78jqp6EShJhISJX++jjnkLJRO5u/QnM ySO0ht5vYYGy99tPnUXuQmd2daf96CR0MqjZMghlZWWYCug2XIAtUN1CVIXnpfad4QW5 ofaayXWJVLopb+KvOSIE1ozA/8xw9e6ibD3Zv0ku7bPjxJTlQHIdxPnW64aeNC1s7/Ud ATV0RnVIUU9m/wkgSxJu2azoAfjPcWmf7qLjA8pNBGgglZc0NBQenfomGlYAltJT0c2F INNANfhIwZcpsnkmdMRzSf/PVsuDXG2SHEcFXkWXM6oEJMZPRgxISxKAfZlkSlTm5l+D lqnQ== X-Gm-Message-State: AAQBX9fDI0m2xw/NEW50eXWItkDv3vcX4a+P8o858xBpoclYbLhc6cqz bGQGW0dittKRvSU2SmIlVcUxsw== X-Google-Smtp-Source: AKy350a0uPA1FB4zfUmQJQYkReVdccdEX2m3gYR5CuipNp/6PlquyjnM03BQxqQUt7Q9RdcVC8yVQg== X-Received: by 2002:a1c:e903:0:b0:3f0:a023:2614 with SMTP id q3-20020a1ce903000000b003f0a0232614mr6624420wmc.6.1681580195782; Sat, 15 Apr 2023 10:36:35 -0700 (PDT) Received: from localhost.localdomain ([94.159.161.55]) by smtp.gmail.com with ESMTPSA id m2-20020a05600c3b0200b003f0652084b8sm10869481wms.20.2023.04.15.10.36.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 10:36:35 -0700 (PDT) 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, linux-mm@kvack.org, David Keisar Schmidt , ilay.bahat1@gmail.com, aksecurity@gmail.com Subject: [PATCH v5 1/3] Replace invocation of weak PRNG Date: Sat, 15 Apr 2023 20:36:32 +0300 Message-Id: <20230415173633.5422-1-david.keisarschm@mail.huji.ac.il> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6DEB94000D X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: rrrofdske61rhkzt1646akcmuansux3w X-HE-Tag: 1681580197-244245 X-HE-Meta: U2FsdGVkX1+84rAcj6TQubdxSbC8DQHvrctDRV2vAL+/kTJIcHy7hQksbUIEZ3mcFuuAv2mGe/Bha0YLpqu5lqkKmPM6ju3tUsDLu7EIH8JT7yCRPTprA98cF3kIWbbjpv0NfO69HyxmqxXfY0tu2vyoC24TJJnc+OYDNTLPP5Fcxv+WlbOj7yW2zWCHfhSLpDuIAIoMRFGKxGuU/zhD9bQrgVCG3gUn5t9P79RgrGlfaIqPlUdbGiCszWI03nX4FY5eI4B+H+09uFMYpjhCpAN50mdHkVtrKuuNG8g0PFUSArc+xnXFgjK95mgrlrA8qH0JWq4THNZb17IyAGsSvM4CKaBFDiaCVWBFQEvGjW6CsVgcxgvRKEXfgrPJhKKEwD7rt7MmpbNIBkxZiAXE0jcVaf11T6rloLCqmlwNri9v3RcZCF7irWe7o7xqYtMz+UrbJSeCS/Nwd/A0iU0Y5nam0MJw4oQ/73+Sy/z7P6wP1nrc2waRtWnuX04WTPTieR9t7VsX2qJ6PFyQqmt8rPpWVLAloFa+vGzkY87X+p7pZ5b3td+q1c5N+oZsLQQehf58Fl+OyI0K0gkvlrOuDuJUdYaq7oynBfc0gmAw0yrCQeDhwSX9yVi5MSwaHvixqfdlijoqbMI2x/DZX9fMUi8JFgd9WHij+r0Hrw5sXsdPGanb9/jLVMmi8QenZBFkYZMm5pt8hVesmPLs6Okk4V3IAPAkPfBQ1W7+7FivELfM1Z8+yPNXXy7cXtkpldYKdsW2QNvpRxOxwkj3IC2sXUHNgO5bU6tH5MET1KfFholFx0MGNyHiSLQJBoQJKRaSU0/0xmlWzgm8l7q9NpbZA83FI43/EnA4MFNtxQCUI6vNfLwhxZUbw0wEYO9vGNPKhg2RaGZ2EWLBYMegrZiyZeLGlAZgvD5fqw1gIJ9yxolySJeIdBROGdM5/AzOzggXjfMH/jtDQaoJuqTEd7L QcdyarLY RRJK3Y8F3Q8FvsQzQTx+r5mVS1+Xq+h3f/890koQX3ubn4qQlqRv0veSuYzqN/tabsLHh+sdOrVOCjCER+rnkeLwFzgP23fpeK2/I8Q7tTgRHDg7PXbUr4oNSDYemWFyUHObtK0p11jtQIcgkCRFsY92txMmwSBN9phmieaBydwA4MOmtrHZUAIDuKkX+OruWUuvWuVukTumhwpYoOaqC3cL5fXEt/YbMVnjPZjcWN6E/+W8XqgggLfbTmhhkgp1RbCCiRFCbVR331zypI925t5sSBXKZdBGuuZzCRTJVMMVPlFSwj12Lrxi1dFcHX6X/nqPKwyzF1ozllv+Yby42YUd6qPUmkRBpZ8eIIvfR0Htpi5YGVXb1raXA2/E9XwlDCMki/+kVTw4Fpl3a/rZczvq4i5hqO+gOecwPhWDT7GMdrQWQ1HiDwCD+BA== 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 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. Signed-off-by: David Keisar Schmidt --- This fifth series changes only the arch/x86/mm/kaslr patch. Changes since v3: * edited commit message. Changes since v2: * replaced instances of get_random_u32 with get_random_u32_below in mm/slab.c. mm/slab.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index edbe722fb..7c8bb4a8f 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.37.3