From patchwork Thu Oct 13 17:52:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405897wrs; Thu, 13 Oct 2022 10:59:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Y/GW8uVGzq8ZfEYu+WtH/gici9KPTA+pRUUUcML2Xys8xHL5VFF7mRFq8vAkoa5NEhjMU X-Received: by 2002:a17:907:2708:b0:78d:d22b:c8a9 with SMTP id w8-20020a170907270800b0078dd22bc8a9mr710119ejk.640.1665683961009; Thu, 13 Oct 2022 10:59:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683961; cv=none; d=google.com; s=arc-20160816; b=huhzlV1aFo9UfZijlrNOc0fwbYenU2imKsxk2bPYX4Ang/idXymf6PZCjdYpwLEFZm WoVPohEs0HIJs/LfKg2fVB8lds3luTMTyOno6iJ+rb5VvOnnR7xDM4C3BH5zkq+x2O05 lLGJA+4tKTLOsvfx4RmlhkaC+qVZwdIRQWzrzFhGWjSBAcLl4gGh1k01PM/YMvtyhdnC c/0YP/aY+pXxi4sLJD6Kp6jBZ+plLivrgBUoOEkUbN2VRxiGOmMXniYCLxM4H7Gq0bVy S4Ove9DX4IxWzJs4YUhhkpbhj+VycEgxhAiUUK58JPm/L6CyM7tlUkpkyRO1gY+VSqLr RWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c8g/3wVNBpOrTE5cYiQJHmnb+RJsifxHV/bSyZ14tBQ=; b=zCcP4P85i6bW6b6DI9OOi/8w04ah5FEqt5gHlFCeb5ViPSiBzMdbtUsMBGgIc7DeKw uvMHt3qZK94LK77Zo4SS2WMvMx2LnMxjzXRSRCpx6o+k8X8oFCLkix1uvaYsRexfsQ4f e+lnSE0PFanZLSjUrXKp+DqKgjUgPrOtDFKDoh3k3KuUFJ6wjJMkEfzmxXB2m17xY655 Zo1Vp95dxiaQrYeblufUmnlV8gS3vNe6SX5gbJhnKs7sT8YCWtI2fDh37BJx0o6noY9f 8QUzJSUYDVE1+chnI95ifHxTx6gC8DWGdijSq55/QKcKCRZXwXxrnE0392i5kZagI7pO h8RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s1ThOCGQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a5-20020a056402168500b004592b993080si276593edv.162.2022.10.13.10.58.33; Thu, 13 Oct 2022 10:59:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s1ThOCGQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230231AbiJMR6K (ORCPT + 99 others); Thu, 13 Oct 2022 13:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbiJMR5Y (ORCPT ); Thu, 13 Oct 2022 13:57:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD08072B4C; Thu, 13 Oct 2022 10:56:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DE223B8203E; Thu, 13 Oct 2022 17:55:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 462B3C433B5; Thu, 13 Oct 2022 17:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683749; bh=TAFAzVRcT8iWyQmsYbtgwKU6lJ4PGejfBM6+WyQv08c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s1ThOCGQ628SNGIK5YnR8W0JA+oXIFsljjGj1ujC0B83l5aKHOoEG80lRstKyP+Ve +kDhJPAPX5L3c5N7tRPSDgZ4H/5tRlupNPujP/7qvUVH9/+qtAIqDqCcEKjTdS8MVv gZOCLEJjuUFvhBRUlrYbfoQKxcfz5fpeWB8ylhF8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" Subject: [PATCH 5.10 36/54] random: clamp credited irq bits to maximum mixed Date: Thu, 13 Oct 2022 19:52:30 +0200 Message-Id: <20221013175148.222281332@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596225331179491?= X-GMAIL-MSGID: =?utf-8?q?1746596225331179491?= From: Jason A. Donenfeld commit e78a802a7b4febf53f2a92842f494b01062d85a8 upstream. Since the most that's mixed into the pool is sizeof(long)*2, don't credit more than that many bytes of entropy. Fixes: e3e33fc2ea7f ("random: do not use input pool from hard IRQs") Cc: stable@vger.kernel.org Signed-off-by: Jason A. Donenfeld Signed-off-by: Greg Kroah-Hartman --- drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -981,7 +981,7 @@ static void mix_interrupt_randomness(str local_irq_enable(); mix_pool_bytes(pool, sizeof(pool)); - credit_init_bits(max(1u, (count & U16_MAX) / 64)); + credit_init_bits(clamp_t(unsigned int, (count & U16_MAX) / 64, 1, sizeof(pool) * 8)); memzero_explicit(pool, sizeof(pool)); }