From patchwork Thu Oct 13 17:52:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2130 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp404545wrs; Thu, 13 Oct 2022 10:55:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54e1nGAbkGwXKg0x+3KtJuxXtrfZ05s6qToyI3TRamYBiXWGphbvuWiX8TOlL0wbqfDxS/ X-Received: by 2002:a17:902:d48f:b0:180:c712:c664 with SMTP id c15-20020a170902d48f00b00180c712c664mr939820plg.132.1665683718755; Thu, 13 Oct 2022 10:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683718; cv=none; d=google.com; s=arc-20160816; b=VokjS+XsDoFVlSUxhbsZ7RQpepP/RrPEgbXclceEEjDwGmn4C/5ncjOU/zRDBsK7NH ZZWpciSHUlsQoMck2pQLIBLMKNqJy5ntheqIettK2M9K9LlJvDhB8ewViXFQYtxDIRCh DKZE5Sdnb4n3tZZ/g3dlxtXCg23zxS0/8O9PLG4Sb8E+qSZcviIMt2wWEoLJSxS1O6cW ztY78orvun0XmqGIRVp1gLSUvgnjYnCIip4/SM5SrNfqKeG6epIGjOvLQ6a4dMH7Jc/l L1RAI8CYmNfWLmRe2vdFViuW1fFj3n8Ei+mL6wY8cnGczmaEyBWUGP6q1L2rfCRaW9Xi wvfQ== 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=7Kr3diaaU4ux4/2fX592SmHV1ZD9xZqADetN1fmD+80=; b=yFhAhWXa7YQZPTZc3KdWYO8ITfVuUHNG8uGchvYHrQU4s/9lF2Z1ABqWZI70eqxF+M FEUZgRFv8qRAeduh7cIz0ox447o4fwB4vsHYmQzBwF/bVViSeDHRe7xkXQs0+QsasbOL VLsooOLG10qGPN+81aMKHk8h94+B9uVkFVVT08g7PefNGtzofe2o0WU1UNyhHqsNpHkj BJT3j9X2Dc0dU5Dj40Ox9BgOUUx+isAaC4LaFy9uFZfdKXuh6tMqMiYnbd2Pnbke8EwU EEnrPeni4oA3noUqqrDPmXNsqvYuor1oxNcEVGVGJ4mwQVWcuMyTlo7pf2pSM2flh4Q5 2/Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ej8ydLtD; 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 e11-20020a17090301cb00b001787f1922a7si509413plh.19.2022.10.13.10.55.06; Thu, 13 Oct 2022 10:55:18 -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=Ej8ydLtD; 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 S229852AbiJMRyp (ORCPT + 99 others); Thu, 13 Oct 2022 13:54:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbiJMRyJ (ORCPT ); Thu, 13 Oct 2022 13:54:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A019B15789C; Thu, 13 Oct 2022 10:53:34 -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 04A89B82022; Thu, 13 Oct 2022 17:53:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BCF5C433D6; Thu, 13 Oct 2022 17:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683610; bh=JaS9pWfJgg7MfTSQcs82nTtNJD73Ta9aTXlVgOCy1lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ej8ydLtDB5txaQ02C8CIW6BuniItj2L4ubeSx+0QKm1Fd/O1SFTxqJke4+RAkzAb9 jsE+poKjuslRyutaRunVBQGA2hUPrZp+0QvGTJVaoh6C782Gv2gWO/Fulwz3uUkJdC 3mAcVJoBMQ3Fwoz3AzQbS/7mGYqjicPYrSycAf6o= 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.4 27/38] random: restore O_NONBLOCK support Date: Thu, 13 Oct 2022 19:52:28 +0200 Message-Id: <20221013175145.161005886@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175144.245431424@linuxfoundation.org> References: <20221013175144.245431424@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?1746595971026305970?= X-GMAIL-MSGID: =?utf-8?q?1746595971026305970?= 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 @@ -953,8 +953,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 @@ -1294,6 +1294,11 @@ static ssize_t random_read_iter(struct k { int ret; + if (!crng_ready() && + ((kiocb->ki_flags & IOCB_NOWAIT) || + (kiocb->ki_filp->f_flags & O_NONBLOCK))) + return -EAGAIN; + ret = wait_for_random_bytes(); if (ret != 0) return ret;