Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1018247ybv; Fri, 7 Feb 2020 12:47:04 -0800 (PST) X-Google-Smtp-Source: APXvYqyYKioKyggDzZvrCic1eyD5DwFLVJbHTNjh7qdMmziOoTWwGDxyyuSsCUV/QcJFDRAc2AnW X-Received: by 2002:aca:ebcb:: with SMTP id j194mr3384683oih.154.1581108424570; Fri, 07 Feb 2020 12:47:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581108424; cv=none; d=google.com; s=arc-20160816; b=AePCi0JO2iXyNfffduZ0eUyYbSZZmeLn4dI/xEehNvxQmxm534OLAC1/6Lz7+llrW0 kZiLCD8vijDZ45ZkPgoAT3ie6CQYDwBJKn26Ua5+5ZdyIqG+I4mkA81hlvw7TuHOvtjk pMTepycmXw407+cJtydWF8DHGSWMMVG5GBctCJsFecblNiodbtpbBzL0of7ak7aZZwyX l02r17IGE6UP7JsBi1UmY3r+S6ICjM2v1i8aD04/BOzUZ/VD0ubsOBa0b6Ml/o98YT3E lFLLXHPAL1IOlTRQY8mUDBze8g2QJY8tWC2SfK2fyQyMhL2vllPynseZbDpNOAar7ofh uuZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=8t2yj5q9EDmyV/PzS9w+E0Devlu4sNU8OEv1fCxi7Ls=; b=sFsMM5aj9vYTIv8pddx+aKUh8w6JD4MX0zeStVshzpS4zA7BlZOo/Xe1BzKRQ8+Ybh f/w8eYyoQLKezBWmibGUUzSA1VVta8aWPG5SMbYkwLujxTbfM6HTXIuXAH1H9oTJg+Wp 1cuURK42wUwVqpg0mF9vnSWLqy8KU1Ycn1l0Gff5H8Rz04GSyPR8XuELpr9lrrjPACNE KiTHMnMzyMtM2Rwm3T1uOL04s6jL0fd7oymriT68CU4P5U0K6ysWHcfJ4zTznnIAEj2W zd4YXdzg69x1A2TLbsc250BHg2MclTvjwhN07YPOh2noxd9l2BVWrNlljWwJ0MVb9WIk st/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kmKPQJqJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f28si266329otc.110.2020.02.07.12.46.52; Fri, 07 Feb 2020 12:47:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kmKPQJqJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727129AbgBGUp7 (ORCPT + 99 others); Fri, 7 Feb 2020 15:45:59 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:46699 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726947AbgBGUp7 (ORCPT ); Fri, 7 Feb 2020 15:45:59 -0500 Received: by mail-ed1-f65.google.com with SMTP id m8so908083edi.13; Fri, 07 Feb 2020 12:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8t2yj5q9EDmyV/PzS9w+E0Devlu4sNU8OEv1fCxi7Ls=; b=kmKPQJqJX4byy1zPbV1JgfB2AeqYwq1EFSvW5fWZM20dpllWfsEKynlT5MWhtRx+cB RLHF6uuzoMgg9yNuvGlydqz7dOWyzVplMZecpCDFEPYV6Gp/GI1s/qdvh2XZWAtvimz8 7dbhJ9rE+lV4u3ZLWdQfnb2mk82nrxWrpv0UlkLNnUDk++tmdtnw9MDQQZtIvfvxlSHV 3cv7qbfvPGqR3foKK66tXg3mWY5hwmAdNbksoGWe15GUDbsSDBdC+xtMOH4WKdMeqNh7 +zdpTQMReoqyMNWUR8nwDM3+tgi1U9Hr/TcLoZ3F+UpZabuVKG6W0OkJWhtgyr70LINq BQVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8t2yj5q9EDmyV/PzS9w+E0Devlu4sNU8OEv1fCxi7Ls=; b=PKHkKsA1buaIyYROkaY/imdqxgdFCRVF88/goJEGcu9bQqSyiGvMwVAAQnirEwOI7Z dCyBAp5SHZqagr8//Twh7k4vtbZ8d070ptn29krOcV2qd0mbdDU4JvGkaO4bLYA3QoRU o71TFwTLtq8xvYVt5tDjOtcA1T3wjEcVh5BParjBX8rpnA7m9fQliUoNdmgeO+BDamo5 45he6RgZ5KFB97JL/S8v8bYwMu8/XFCW4EeeKL2mu6W9M7XW7ZF6P1TN95l/kzS72Ny5 6EZEOpgyVMxeebVC7PRnfB+ACqKZghsWHFjF7I6ptEyKce6Hl7xHOYi3codyeLPX4vBk 1Wjg== X-Gm-Message-State: APjAAAVku042LF6UF1dvu7VzYDNQsTjkTjXc/YQ8HMiqPdxJSyMc5Nyt tZu4m9lxEwyw3vRJtBsgUWk= X-Received: by 2002:a17:906:1356:: with SMTP id x22mr1078263ejb.55.1581108357533; Fri, 07 Feb 2020 12:45:57 -0800 (PST) Received: from localhost.localdomain ([109.126.145.62]) by smtp.gmail.com with ESMTPSA id n3sm467138ejh.74.2020.02.07.12.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 12:45:57 -0800 (PST) From: Pavel Begunkov To: Jens Axboe , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] io_uring: add cleanup for openat() Date: Fri, 7 Feb 2020 23:45:12 +0300 Message-Id: X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org openat() have allocated ->open.filename, which need to be put. Add cleanup handlers for it. Signed-off-by: Pavel Begunkov --- fs/io_uring.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index b0e6b3bc1aec..42b7861b534c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2547,6 +2547,7 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return ret; } + req->flags |= REQ_F_NEED_CLEANUP; return 0; } @@ -2585,6 +2586,7 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return ret; } + req->flags |= REQ_F_NEED_CLEANUP; return 0; } @@ -2616,6 +2618,7 @@ static int io_openat2(struct io_kiocb *req, struct io_kiocb **nxt, } err: putname(req->open.filename); + req->flags &= ~REQ_F_NEED_CLEANUP; if (ret < 0) req_set_fail_links(req); io_cqring_add_event(req, ret); @@ -2857,7 +2860,6 @@ static void io_close_finish(struct io_wq_work **workptr) } fput(req->close.put_file); - io_put_req_find_next(req, &nxt); if (nxt) io_wq_assign_next(workptr, nxt); @@ -4233,6 +4235,10 @@ static void io_cleanup_req(struct io_kiocb *req) if (io->msg.iov != io->msg.fast_iov) kfree(io->msg.iov); break; + case IORING_OP_OPENAT: + case IORING_OP_OPENAT2: + putname(req->open.filename); + break; } req->flags &= ~REQ_F_NEED_CLEANUP; -- 2.24.0