Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp5880436rdb; Sun, 17 Sep 2023 17:29:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEe8EyNaJzer4peNJzpbrR7o5K1rDIrhReIDf5dRm48fATQvFSf1ZIx7FDPwSNzWAnB6Hpl X-Received: by 2002:a17:90a:8043:b0:26d:2d77:da7b with SMTP id e3-20020a17090a804300b0026d2d77da7bmr6863023pjw.6.1694996951089; Sun, 17 Sep 2023 17:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694996951; cv=none; d=google.com; s=arc-20160816; b=Iafb+Nnam56epeW1PE4kDNmdodv8O9Bv/MIoy5fWuts7zCYvwmkBqGgpZRcUybUzZ9 QsJHjGceTz2B1vyaBeNQbEve79bhwQyhs/dXCNoKCSGn2XFTO1PjXXRP5hIfUXd8WVVR CYDMKUq9n4hCl1n+XWkHD4CNeB959Ydt4F4L46H5ynIP+Xbz+mwPpWtGrbSS7xOdfCmS bYuhqfzquZt0ImoiAHtEsLIJbGemO0qSJkI+5PmvETaxXq6gH6GSifppVOW/ApI3XvoU dOP49Rjh4gsnuXxM/E9aobRAZPazActGr+UXlnPggPZR+0LC3+CplDD0s4hnPph+hGBt rPZQ== 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=DPezQTRWQi+v9+luxXc2nofjIfcGO8M4bZ1wVI8Xhl8=; fh=VJGsScZUGByhbzCD7TtKsJaNkym29j4+mXpM/DyEkzE=; b=P2YoNGonnboqCZEuGZpxyYuE5yumrjfuz4Cr2BQ7XTMBQISE9ZTpJlHZY8DHLB16JN DYF+QeKzogWvUyNLy2RpxXn85lPemkhG5bI/6obJ7Lkc/bXM/flTd24A6HwTs4t0awHS ez5NuugdlvYN/UKNcpA52vAddGXpS0ho/EwAe8kNzd596m6AedqTafp/IGTCySwFbqu8 pKV3kkLQ8UpYVAvGfXOmmX7dqQpmz1qbP3CFxiJRylu6X0XbJ9j1CcT7fPBQmpBjvQH9 7stRf8gmQiWdMC+Ur6Utybuauph9hciCD3Wqz7CSfVpEK37O+eQa94npCz3IbU29JPo8 DOnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=btFPsPWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id f7-20020a17090ab94700b00274df6d4c38si2207484pjw.89.2023.09.17.17.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 17:29:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=btFPsPWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 9B8C0803D5BC; Sun, 17 Sep 2023 13:11:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240523AbjIQULO (ORCPT + 99 others); Sun, 17 Sep 2023 16:11:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240558AbjIQUK6 (ORCPT ); Sun, 17 Sep 2023 16:10:58 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E1F897; Sun, 17 Sep 2023 13:10:53 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 434A1C433C7; Sun, 17 Sep 2023 20:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694981452; bh=mhN/REjF0Y9PX1wLUk59NBlDy7uW55ix/Z/pTilBZpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=btFPsPWJtYLs3HIhXk7W9sGfjKBvb2rd0wtWT/9cEKEqn+tx+qlnwl7BjihoeFFs1 nT/v3dKbV8hEm6HnVtswdszRhf7kv7eh432rLUDh06D4HY6TVhxakfGoeG8F+x+mSi CdAtSoMKYvYx7RSJItVLrUMBgI86plmsFNRwvYEE= 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.15 057/511] eventfd: prevent underflow for eventfd semaphores Date: Sun, 17 Sep 2023 21:08:04 +0200 Message-ID: <20230917191115.264721695@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230917191113.831992765@linuxfoundation.org> References: <20230917191113.831992765@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 pete.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 (pete.vger.email [0.0.0.0]); Sun, 17 Sep 2023 13:11:47 -0700 (PDT) 5.15-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 249ca6c0b7843..4a60ea932e3d9 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -189,7 +189,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