From patchwork Thu Oct 13 17:52:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405919wrs; Thu, 13 Oct 2022 10:59:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Atb4OQIpmUQyqbOdCQRL1ZTI1hcjpkVy7ToUt/QLR/38MxwTK1khXaJ6zX9pkIUvEKCaT X-Received: by 2002:a05:6402:2804:b0:439:83c2:8be2 with SMTP id h4-20020a056402280400b0043983c28be2mr874065ede.292.1665683965550; Thu, 13 Oct 2022 10:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683965; cv=none; d=google.com; s=arc-20160816; b=WMTfRFv7WUry/Rq2MR7wlNw7gYLEayl+ZYPEx5rZEdmWsQzZVKGckW41QnKyeSNWmy TTTgP0vyyCtOAtRSU/QD8DQNeznOyTcM5JtpsKXk1V2xL4r7246c6wJ/dV2Yzn0yfqWE MLYqlu2v3VqPsLdIlRzS805cTXp6X3vEf2N22Fa/r+8JAwuWRXmUhgLCxYthOhr/H78Q NuDv5M0PCTBqbc+kwXaOQmMWEtWKuj6PGJ2borBGWx2rXEpOgQ+lYT4IAANHYe71j1p+ +dgLrFSCl8HdKYjJfFrqotedfSOv5b6GIKMAakJOESsXbCN078zgcWVdnxQaNgJULbB/ N1hg== 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=1jAiWQUhwyJ7IXHQJIwmJCakXSget6fGqxkr2+MP7ik=; b=Vrq+xydKhxvNWm0mhoOo/IQkf+eaNlpRow1rrWmK9clz+FqXT0DubeEwO7zysTTXw9 2Yk///0VarXxvb5WH/9PrBazqX/kJqfm7hCE831XSia/y+fnxZu/WMTMZvEKVXyURfPj i5DUeRGcz3dGJnoCQpyc22qv/6/DbEl7kUHYSyx4BVjT7VUSxl8hajpscWySE3nrW+W6 8WaFzVehGBahOENPtUifV1ZT7/c3m8zfJ7rtbKckm55W1lnjn7i7xtomDttptQdpYlb9 kyY0e4tN5Mq9LTJmw/ydtgwgA39hAEtVBg1GG9DVGL6d80sO0m7L4nxN9DrtNnfxzfOX AtFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jXxKt23b; 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 dd18-20020a1709069b9200b0073dc32ccd9fsi384121ejc.104.2022.10.13.10.58.49; Thu, 13 Oct 2022 10:59:25 -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=jXxKt23b; 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 S230264AbiJMR54 (ORCPT + 99 others); Thu, 13 Oct 2022 13:57:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229968AbiJMR5R (ORCPT ); Thu, 13 Oct 2022 13:57:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A27636852; Thu, 13 Oct 2022 10:55:59 -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 dfw.source.kernel.org (Postfix) with ESMTPS id DCEDE61929; Thu, 13 Oct 2022 17:55:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7B94C43146; Thu, 13 Oct 2022 17:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683746; bh=M5SrNn6tCD5tcFZF4wuvpfkO48LGdOWAVq54mYIk304=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jXxKt23bDA8hOLhPTkgQoP0DSPFef1/rERF+2/KUDQZEY0X7lOCUOoeRnq/D7qK3H JLNsgvKy4av2+TeCkpESPrQ/i/ucN/AMD6StSNdYEsJ6WATxqUW7SAIy5Kml+inkBQ 1eY9mQVej4zGX8pa/NSeh0HAeRFegInzsH2ZhO7c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guozihua , Zhongguohua , Al Viro , Theodore Tso , Andrew Lutomirski , "Jason A. Donenfeld" Subject: [PATCH 5.10 35/54] random: restore O_NONBLOCK support Date: Thu, 13 Oct 2022 19:52:29 +0200 Message-Id: <20221013175148.199914089@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?1746596229923881349?= X-GMAIL-MSGID: =?utf-8?q?1746596229923881349?= From: Jason A. Donenfeld commit cd4f24ae9404fd31fc461066e57889be3b68641b upstream. Prior to 5.6, when /dev/random was opened with O_NONBLOCK, it would return -EAGAIN if there was no entropy. When the pools were unified in 5.6, this was lost. The post 5.6 behavior of blocking until the pool is initialized, and ignoring O_NONBLOCK in the process, went unnoticed, with no reports about the regression received for two and a half years. However, eventually this indeed did break somebody's userspace. So we restore the old behavior, by returning -EAGAIN if the pool is not initialized. Unlike the old /dev/random, this can only occur during early boot, after which it never blocks again. In order to make this O_NONBLOCK behavior consistent with other expectations, also respect users reading with preadv2(RWF_NOWAIT) and similar. Fixes: 30c08efec888 ("random: make /dev/random be almost like /dev/urandom") Reported-by: Guozihua Reported-by: Zhongguohua Cc: Al Viro Cc: Theodore Ts'o Cc: Andrew Lutomirski Cc: stable@vger.kernel.org Signed-off-by: Jason A. Donenfeld Signed-off-by: Greg Kroah-Hartman --- drivers/char/mem.c | 4 ++-- drivers/char/random.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -981,8 +981,8 @@ static const struct memdev { #endif [5] = { "zero", 0666, &zero_fops, 0 }, [7] = { "full", 0666, &full_fops, 0 }, - [8] = { "random", 0666, &random_fops, 0 }, - [9] = { "urandom", 0666, &urandom_fops, 0 }, + [8] = { "random", 0666, &random_fops, FMODE_NOWAIT }, + [9] = { "urandom", 0666, &urandom_fops, FMODE_NOWAIT }, #ifdef CONFIG_PRINTK [11] = { "kmsg", 0644, &kmsg_fops, 0 }, #endif --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1299,6 +1299,11 @@ static ssize_t random_read_iter(struct k { int ret; + if (!crng_ready() && + ((kiocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO)) || + (kiocb->ki_filp->f_flags & O_NONBLOCK))) + return -EAGAIN; + ret = wait_for_random_bytes(); if (ret != 0) return ret;