Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp6070119rdb; Mon, 18 Sep 2023 03:18:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKNHBLcP37G6IQ8j4MrzTjQR1gwgAueXC0O1B23QzaomgCA+G5FFpvd2F4Uc0WsvxO65UD X-Received: by 2002:a05:6808:1786:b0:3a7:8e1b:9d65 with SMTP id bg6-20020a056808178600b003a78e1b9d65mr10812346oib.47.1695032286737; Mon, 18 Sep 2023 03:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695032286; cv=none; d=google.com; s=arc-20160816; b=i8a9k+AA0i5BjQ8b//gA1I0vNGUZXsC/5BI0pQJBG8gS+eszrxQDojrBBe1Hg/XElX 29rfn9PIWnqYKnjAM06hHFiRVPfGXW0t4Kdg1tCZXGgS3CbdmdPmRAgmmYWEdASYT/u2 IlugIyTzFAFa/2kh/8vWZqcxiqkIanEIAC9c/YdkDXoqj8Kj5HN6iEWmTVSFOudDvmbA eXGLL1OZ5JL8fGaKpYvDOIjM/vxA5N5FJgXwGuE+EcwNMdOucvR97ELZhUVahibnwhlF hcF8OcLzlMY6Ag2QBDR7HXYbb+hfKVOiNI/9V1QiHT20DEQIggWhK0xRw/faIWz+MY73 4q8A== 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=wC9GJfqw9N+Rd4V6+v6fuZM5CKbX9Yu4gwohj4vr5vw=; fh=VJGsScZUGByhbzCD7TtKsJaNkym29j4+mXpM/DyEkzE=; b=Po75lbdgcRp1DZSezdcFysFvPPlEZwPs+IcqWig+/3LysxTwoarOa/Mc/y5Qh3NDJ8 mxUnQ4guAyQHJxXBDPkeqvI0EiXWYaL5oFvDE2YnT+q+PDBJQcUxIdiECiFxFx4D9PKA qSTQtVWs3K4ZyYU/5quFP0YuuOidjtmzcxdW2i5uNDee1mpjqmw4LnMi9g2q1VBQh6sb ZKgSId5VNwDnZFnTVT9NP7tuDYU3G8+fB8dakl5itZEpwLpBmtVmT/TOobgB6vp3z0se Y7QZbMtfnPz+EK8jm8S5VncoiWW7NBlxja8/Dhk3JlkfyQfuc7DBY2qWK+aHxB0csNMX iXOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fMi5S8sk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id k24-20020a63ff18000000b0055fd1bfacafsi6755662pgi.755.2023.09.18.03.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 03:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fMi5S8sk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 1A48A81CDB8E; Sun, 17 Sep 2023 12:22:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239126AbjIQTVf (ORCPT + 99 others); Sun, 17 Sep 2023 15:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239470AbjIQTVV (ORCPT ); Sun, 17 Sep 2023 15:21:21 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 619FD18F; Sun, 17 Sep 2023 12:21:09 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37422C433CA; Sun, 17 Sep 2023 19:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694978468; bh=9J9CDNFk+b/FvWvulO7WaRSK3oemxuy3vU4AlcLaMSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fMi5S8skMzOZL34e0/RSb2+tCTJTZMBLhdGb8lC2NX8KbUabW1FblF8QkDI/Q4vfh oZFh8SlIz109U8jrWYVDmle6XPGyL8d54yJd7K0K8gF1UymmrCUdyX2t7MjGDJQL3P aaARASnFIpfcJa1Dg8vhJqXzxE7r7m5JpbGCNQgo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wen Yang , Alexander Viro , Jens Axboe , Christian Brauner , Christoph Hellwig , Dylan Yudaken , David Woodhouse , Matthew Wilcox , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH 5.10 067/406] eventfd: prevent underflow for eventfd semaphores Date: Sun, 17 Sep 2023 21:08:41 +0200 Message-ID: <20230917191102.906894586@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230917191101.035638219@linuxfoundation.org> References: <20230917191101.035638219@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 17 Sep 2023 12:22:07 -0700 (PDT) 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wen Yang [ Upstream commit 758b492047816a3158d027e9fca660bc5bcf20bf ] For eventfd with flag EFD_SEMAPHORE, when its ctx->count is 0, calling eventfd_ctx_do_read will cause ctx->count to overflow to ULLONG_MAX. An underflow can happen with EFD_SEMAPHORE eventfds in at least the following three subsystems: (1) virt/kvm/eventfd.c (2) drivers/vfio/virqfd.c (3) drivers/virt/acrn/irqfd.c where (2) and (3) are just modeled after (1). An eventfd must be specified for use with the KVM_IRQFD ioctl(). This can also be an EFD_SEMAPHORE eventfd. When the eventfd count is zero or has been decremented to zero an underflow can be triggered when the irqfd is shut down by raising the KVM_IRQFD_FLAG_DEASSIGN flag in the KVM_IRQFD ioctl(): // ctx->count == 0 kvm_vm_ioctl() -> kvm_irqfd() -> kvm_irqfd_deassign() -> irqfd_deactivate() -> irqfd_shutdown() -> eventfd_ctx_remove_wait_queue(&cnt) -> eventfd_ctx_do_read(&cnt) Userspace polling on the eventfd wouldn't notice the underflow because 1 is always returned as the value from eventfd_read() while ctx->count would've underflowed. It's not a huge deal because this should only be happening when the irqfd is shutdown but we should still fix it and avoid the spurious wakeup. Fixes: cb289d6244a3 ("eventfd - allow atomic read and waitqueue remove") Signed-off-by: Wen Yang Cc: Alexander Viro Cc: Jens Axboe Cc: Christian Brauner Cc: Christoph Hellwig Cc: Dylan Yudaken Cc: David Woodhouse Cc: Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Message-Id: [brauner: rewrite commit message and add explanation how this underflow can happen] Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/eventfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eventfd.c b/fs/eventfd.c index b8d38b970ce7f..3673eb8de0356 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -191,7 +191,7 @@ void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt) { lockdep_assert_held(&ctx->wqh.lock); - *cnt = (ctx->flags & EFD_SEMAPHORE) ? 1 : ctx->count; + *cnt = ((ctx->flags & EFD_SEMAPHORE) && ctx->count) ? 1 : ctx->count; ctx->count -= *cnt; } EXPORT_SYMBOL_GPL(eventfd_ctx_do_read); -- 2.40.1