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 646AFC77B61 for ; Sun, 16 Apr 2023 17:22:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F40A56B0072; Sun, 16 Apr 2023 13:22:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF12D6B0075; Sun, 16 Apr 2023 13:22:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB8DC6B0078; Sun, 16 Apr 2023 13:22:48 -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 CD3BB6B0072 for ; Sun, 16 Apr 2023 13:22:48 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9BC3F8022E for ; Sun, 16 Apr 2023 17:22:48 +0000 (UTC) X-FDA: 80687924016.03.4FCEA88 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by imf29.hostedemail.com (Postfix) with ESMTP id BEBCC120008 for ; Sun, 16 Apr 2023 17:22:46 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b="C/KwP3v5"; spf=pass (imf29.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.128.44 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=1681665766; a=rsa-sha256; cv=none; b=2GRVvM+HF1eSM9Uvyxs5uGksO3Pdp2PcyK9h+UI/JlYz3vp2D7Mv3cw7xSHTKDsqFWMtP7 WpGUc4TNBjmFn5HzkdjSDEdUVyOJsdYtXS30MrmKrBnbvKOlP8gO6u7aWzBNwadfCdLlBe 5Qo+C2UVcfBmkIittJc/JknrPw1/k6g= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b="C/KwP3v5"; spf=pass (imf29.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.128.44 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=1681665766; 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=iFMrYnSSw3X9l1HGYfVpxqFoRoszC2z+WCEwwhPnbPU=; b=5DfdcakOdWCDX6mh5iC/V28lYDpLPjfcbqKqR7hZmOVZPUw41WEZgZlwUfqqM1IR27tS3H WoTOIcZPCvUanZYDYTGM9c4KAE4hB2DGZKi5Xl57Z8l+vixiMi/Um3foFW+LRxIzVNpHJG POzYTGy3Y2giVfzVLV8qGByYIdsjAHI= Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3f086770a50so5889965e9.2 for ; Sun, 16 Apr 2023 10:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.huji.ac.il; s=mailhuji; t=1681665765; x=1684257765; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iFMrYnSSw3X9l1HGYfVpxqFoRoszC2z+WCEwwhPnbPU=; b=C/KwP3v5mZWBHJcdg2Xa3ou4cVQDaqoFZpXKR5qbe/2G/gxN18JGjC7ccAYfbdFAvf e21nfDat0IaNkLzgH9kZf+kRZwzVU8G1NuKoYxSEycinNlP4GzPuQiuIbeLKiI4t9e/S cucBfK8dzbl2gM9luW6kchCriSA9N0uQsz5W0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681665765; x=1684257765; 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=iFMrYnSSw3X9l1HGYfVpxqFoRoszC2z+WCEwwhPnbPU=; b=YSfnUsP/QfQKgJJoo0j519n/hjLfVDlJJQKHRlh1Yi3YZ+Kl06YbdlggykPNkW8g89 zLrl9o4Epc/qmKelR5RKMFC700EqWqS80BCGntfVOJPetjLcl22iZGqObPyxy5GdZ2sb qd8I5mX2Sg1f/1Fr8jhe7LhLSAU5brnJRhRWU6ljvSdpAHDsM/+uoeNMzbHTiXi7zkTx cw164yVfbSCg0vA0p0RJiCy1ZLCk3D+POrs/0HtGdmqGfKFxodMiMUlgKEHJ5gGpbRRO 5nklviNbeLbUPdYJeggTwAMq8Drc5Fu77bG0pBGtaNVNxiP+c+Eq+xoWKuD+uHvmi1ED AwAQ== X-Gm-Message-State: AAQBX9eSHNjuURfB36PSeTnDoWK46WbZlnsSghqU+OZSbxpNbDfHp8iz AkPT1LYXIBtNKfOfBud1FyVyBA== X-Google-Smtp-Source: AKy350bWXYWJuKr+DH+kawyLpUCX7nTyWaX63YESheORChPTrGVFQ6sLd1J/LDehgJiyU77SS9Lt7g== X-Received: by 2002:adf:f089:0:b0:2cf:e422:e28c with SMTP id n9-20020adff089000000b002cfe422e28cmr3445139wro.42.1681665765385; Sun, 16 Apr 2023 10:22:45 -0700 (PDT) Received: from localhost.localdomain ([94.159.161.55]) by smtp.gmail.com with ESMTPSA id m14-20020a056000008e00b002c71b4d476asm8446889wrx.106.2023.04.16.10.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 10:22:45 -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 v6 1/3] mm/slab: Replace invocation of weak PRNG Date: Sun, 16 Apr 2023 20:22:42 +0300 Message-Id: <20230416172242.13185-1-david.keisarschm@mail.huji.ac.il> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: BEBCC120008 X-Rspamd-Server: rspam01 X-Stat-Signature: axne6cyuojxiqe9iu7odrbo7thwabgah X-HE-Tag: 1681665766-599014 X-HE-Meta: U2FsdGVkX1+8a9bWGINItvaulb1veMMzaseuSK+mOMH/ViuI0ukmMGjAzMUAPFQXxEx8qG2zaHBFPHI160rH581IYE0FItJrBQm7J3Y+XqaeHQGqLo2a+x3nL0LRjyyIGA6oibh9hxI4HAc4eCqmf/6H60FV7bf3HXT+ica/XmyC6v4L6F/8vtILPFMp25qnVnJpv461rc7I51W6Ly0aFC8dzwtSYCvGWMdTPOrFvbiWKtya0+l4+x/DoDsNb9WG2gaku28lHg/h62B9rsvvMcFryRuzVbEX7U/UFIXHrvNxJyNUcKFML2uDO6flJIVVxuMU/UB5Y5PKt2TUdVcFdSHznkBmov8iv2EZO12dqvKKAxwX1xlEVGf/gO6aN0azEMX9h+bPki3TZa5SYmAllKB9NH75c5xq1YWY1NJ9hxG6ckpXk+vIfYHCAY9lro5agTH1knyqvk+R8sn5RQ2VXycVlFmtk3uznXd08FJdoOH3rFs5tJjCWNAZOFARAApTLntYjnHK9+bOIfMRzv5X+YZotg468M0KESkRi2XIuR1l/d+yDopOHAIUsa+aO2MfCXp59F4HNYlFrSxxjFLvj3qJ2oUE68uoHzGgl6ikPe+DlRwd305Jh0IHdbh132veJx3UcTqrX52jKsnOmYfZ+52DYGUqXtzwknPEkMEZb2yNhTlOfyV828nbFbxwY1Zbh/pS8KUNIdQBIEDkQ9BsgLSL3fz1YpPTe/oIwNKwKs7m5YnoPpVe5ujndbrQNbZVSufZjBlTgk3OsfAF+rDkxINrvJhoKmmfbTY7xRWC/8sxodI1gjaRVdCaDyABdD1hxAw3RjewcMvSgN6GMzebAqdZ7DWoDJ/+o6GMGXFh3uIHCvmn6QlfkCMSJrtG2qgwjgM+EAVNiVEaOOOAB4InTZIIa+mSR2G1g/buSh/G7FVIRlIQjgQWovz5RSsQ3YhqsYLc2pJyq/CO4rA/P7h SXgqWQMN LPJn770GH3U2X1pSidLvUl3ovKNbhomoaLgoKq7amC3ZAVEgCbXvwzqFD/wCgnkZGcIvQ4+r4Yxx8ZcUyyypKH5L+EfIlGhsANYxfjIq3P5WA0lGNC8WVmVe0dMN0PbuTn6YoCiHnaAbCJdR2Zpml1I4WB8XlIvPEJboFbhZVCewLxnDI0L4LDkQV2Bfq4PQyLVPp1KPgEQSoXgrePt69EV3nAm7ogGVaeS33tE+4EJmvd8SrREtZfP4iqo69aGLd74pVrczRiZ2q6HkC4Be1AT9ANG3dd0Gs1Cq4oNdPjccYvz1idFkGAGRLIjoTmJDV3J7ajE1tQVGhDyIQCMlMjrykBSXJYm72MSoRNB+qJzKV5jqNcMoW6QWeaIQVaPKa46v3D3byWDA+ihU2taAFoHt1iKN0MYCZz73XfF6s71hYDvmlNAdtHWMBLQ== 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 --- Changes since v5: * Fixed coding style issues. 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 | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index edbe722fb..6ac30fd05 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2360,44 +2360,34 @@ 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) { bool ret; - unsigned int rand; - - /* Use best entropy available to define a random shift */ - rand = get_random_u32(); - - /* 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 = get_random_u32_below(count); 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 +2408,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 +2437,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