From patchwork Wed Jun 23 15:17:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 466327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 084F8C49EA4 for ; Wed, 23 Jun 2021 15:18:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1DE961075 for ; Wed, 23 Jun 2021 15:17:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231382AbhFWPUQ (ORCPT ); Wed, 23 Jun 2021 11:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231390AbhFWPUP (ORCPT ); Wed, 23 Jun 2021 11:20:15 -0400 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC1F5C061574 for ; Wed, 23 Jun 2021 08:17:57 -0700 (PDT) Received: by mail-il1-x130.google.com with SMTP id h3so2935065ilc.9 for ; Wed, 23 Jun 2021 08:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dh0c4CNS4QTUOp6NK4eb+9Hjedew2mIOcwvS7F1Bn54=; b=X9DDh2es5LFu3bWA8RTnZTVT1bMNtbiwFQ0pR2gXT2Fkw7+SWWkcyJCSJXoRc7XbI9 iqIuim7HhIxr7IRe2jZq2FPqggVS8iM0RcDPlubYPsAqtUgTfSQ2MLLdP6E3crl0LFAg nUpY+8yWuaWkSf9F7KP+/k1c/7GaTrgjHXFmnjJ3EAfib3mjkU0P7tkHH22Po4bWMf39 14zsFiqEW8C0FtMDE9mAeMdPMcjdIC/JQkZu67ZgVwTrxIkWi/yMZrqRIoUObw+n2OZj 6RJ7WxiHB+QcpzbUXEBbNzf0islkbdMMUVAQRh9QDFU4Tib9A0WoFkCgk36tsc/U0Xzq r5+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dh0c4CNS4QTUOp6NK4eb+9Hjedew2mIOcwvS7F1Bn54=; b=mWl2d4YW7O7mmnwAymH4uTyOHajks/vDez59kLd8/wj0nw7mUwsqNcWugb6/6AzVzK e3XUZrAma6VlCgiLqN9MSdcd1xHgwL/sXxNM0w271PQVh0gDCJMiuoHvY/Vbfzm96Mq2 ogns5spB3ZGIKgsoYCxZ/iAYJ3ABSrM2bq7k+MLH2dbheAFBFf2ezs6Fjc94zJj+Rvu6 ELaj5BhNdzGlnbZK7WccWZYAPhZhCTpHmZyJRpx22EUDhNxxVfsL8yi9579qdkM0bfiv JLn4K0PJQ81T7Lqn+MCRv9L/odel5h4Xp7sB8WUdnrX3tFd2cI0ELljV38YqCVAEdQ+j OMVQ== X-Gm-Message-State: AOAM532AxoXnoLNb11EynBMgFwi54ADqffaofzdjBWjdBnfobr9U4Jfg KP1X2UjA3h8MyJqaW7G9n9WFGg== X-Google-Smtp-Source: ABdhPJyX5jFCkLMyaMYwMIU2FErvGlPr2cxXbPTTPwm+IhZzuAMG5x9NZ4uq7tM/hTNvioKyTgl8LQ== X-Received: by 2002:a05:6e02:8b:: with SMTP id l11mr3388531ilm.228.1624461476517; Wed, 23 Jun 2021 08:17:56 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.61]) by smtp.gmail.com with ESMTPSA id t6sm97967ils.72.2021.06.23.08.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:17:56 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: dkadashev@gmail.com, Jens Axboe , stable@vger.kernel.org Subject: [PATCH 1/2] io_uring: add IOPOLL and reserved field checks to IORING_OP_RENAMEAT Date: Wed, 23 Jun 2021 09:17:52 -0600 Message-Id: <20210623151753.191481-2-axboe@kernel.dk> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210623151753.191481-1-axboe@kernel.dk> References: <20210623151753.191481-1-axboe@kernel.dk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We can't support IOPOLL with non-pollable request types, and we should check for unused/reserved fields like we do for other request types. Fixes: 80a261fd0032 ("io_uring: add support for IORING_OP_RENAMEAT") Cc: stable@vger.kernel.org Reported-by: Dmitry Kadashev Signed-off-by: Jens Axboe --- fs/io_uring.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index fa8794c61af7..9b6c7dad0b73 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3453,6 +3453,10 @@ static int io_renameat_prep(struct io_kiocb *req, struct io_rename *ren = &req->rename; const char __user *oldf, *newf; + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + if (sqe->ioprio || sqe->buf_index) + return -EINVAL; if (unlikely(req->flags & REQ_F_FIXED_FILE)) return -EBADF; From patchwork Wed Jun 23 15:17:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 466812 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46DBEC49EA5 for ; Wed, 23 Jun 2021 15:18:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 349916054E for ; Wed, 23 Jun 2021 15:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229523AbhFWPUQ (ORCPT ); Wed, 23 Jun 2021 11:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231391AbhFWPUQ (ORCPT ); Wed, 23 Jun 2021 11:20:16 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F282EC06175F for ; Wed, 23 Jun 2021 08:17:57 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id a6so3970699ioe.0 for ; Wed, 23 Jun 2021 08:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t4u/kAIed02Wt2quW7e3LI/PP2g01D4YOTswdqhIIpU=; b=0Kz+1xf251hAIyz/tmodU2ANxxhCQImhGaTGJisZQsT+f2DLwEPvIfDXQdUe9U6RBM MCsR9sxkasM48cgBikgv5LujHLn3XCVFuce3I5lM6ElJjnMfg69DSJkhQ6I0piB7G7Jm rgij5/qp/UzLhz76d5NcGnqP7Z371FpiMxGdPaTdB/c6r9TNVVdfs2OhdoJEJzwVg++z eU12O+nu/AnvkkkwIcIy55qTQKD7GMHGcDIc/RK1EVSNhJ0AHXjkznTPvblfFmvUQi+X l8Hr0n1w7dcNO/xf3a1RO0xyTmgBKkUr1fJqyOytxIyf54nc7pE9rBYFZN4jUM6DI39i pkaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t4u/kAIed02Wt2quW7e3LI/PP2g01D4YOTswdqhIIpU=; b=XNdWnHGadhBP0xhzZ3vXhKQvym2zgZcQy6p/FiWM4hNTVrUfCd2fIfvZ0juZfPCNT/ +BVhYNL4Vc6xC8N4QHK42ugu7rfVw4dKDEiIWtP6g0u5YJlxqrPb7DiNTShaNjXM6Soi sxIxDOqa4tgspl9UZehgji5vDEczkbtljG7lbtFP2znUxnZ+A4SjiLUpnM5wuXI8qlaW hC6JVAYH96MdUO4UE48hIMZHA3GF2pLkUh+kWl3BpUNxuhTF71uWGCpBzj/fz4zCNACD +idU3EuZTyWvr8v5zYF+hL6ofArHqKecQ7iVM96me/m2vQRJ7OwnFtfaeTcqUFdxaRsl hd8A== X-Gm-Message-State: AOAM5313rZhrO35NRLw1knszXEWw21aiKYecEvLvq7O3ksB05SFMA9nA jFffJe1CBwtXdJMu+IzTNbRoIg== X-Google-Smtp-Source: ABdhPJzRrS+RO4qUS2hpKc9YqL+Rp8OwAXaMyZd3Jiyk/3xYMaBIJpOPhvxUv/tadXJKszJym0cuzQ== X-Received: by 2002:a02:c906:: with SMTP id t6mr82100jao.117.1624461477435; Wed, 23 Jun 2021 08:17:57 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.61]) by smtp.gmail.com with ESMTPSA id t6sm97967ils.72.2021.06.23.08.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:17:57 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: dkadashev@gmail.com, Jens Axboe , stable@vger.kernel.org Subject: [PATCH 2/2] io_uring: add IOPOLL and reserved field checks to IORING_OP_UNLINKAT Date: Wed, 23 Jun 2021 09:17:53 -0600 Message-Id: <20210623151753.191481-3-axboe@kernel.dk> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210623151753.191481-1-axboe@kernel.dk> References: <20210623151753.191481-1-axboe@kernel.dk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We can't support IOPOLL with non-pollable request types, and we should check for unused/reserved fields like we do for other request types. Fixes: 14a1143b68ee ("io_uring: add support for IORING_OP_UNLINKAT") Cc: stable@vger.kernel.org Reported-by: Dmitry Kadashev Signed-off-by: Jens Axboe --- fs/io_uring.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 9b6c7dad0b73..45c606846303 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3504,6 +3504,10 @@ static int io_unlinkat_prep(struct io_kiocb *req, struct io_unlink *un = &req->unlink; const char __user *fname; + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index) + return -EINVAL; if (unlikely(req->flags & REQ_F_FIXED_FILE)) return -EBADF;