Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3924860imu; Mon, 10 Dec 2018 09:58:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/XxTINejkmNINWd49yoflBuKO0XCfcSVJopehKf+ypdLMqs7utO5Y3XbbLWv2rad+9XwX2o X-Received: by 2002:a63:4c04:: with SMTP id z4mr11829251pga.312.1544464733329; Mon, 10 Dec 2018 09:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544464733; cv=none; d=google.com; s=arc-20160816; b=TLYb9toiuUffpZ3OcNwZMWkjb8Jkrpp3vbuBLEKmahDByYJ1HOhMEGs0nf9EY79CZf y0bkqqNnwWzU746xQJSSPBWn2kSZsdkaojhad4PSk+xDY1B7OGE+7AUyRXSuIWAXHcuh fM+4voVtEIRWXdR6hfg2NCq5IoQaSE5rLeLsH4oJKxrw2S4j4bqcPZD4hoRTNBLRezMP nh9HjS3lyM0GgCCtqsaywtrzCPXbWG79m8feWhmZ7f9wFY46ZOUhVArhe16x6Yttfd1o 80leGyCzUTCNmuhSuYqdd2xHNZuJQVKeT8MYEqvhFdjZe3aMqzKv7yVRIx6Yzt8OyGbM L9uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=y1EOk1o2dnDfmeiIHdZLqOeEiI9PCoC9kwHWV9hqkpI=; b=eL2zuJtWNCkFpIvsKuoRzVTTCyilIlfvh2DFNEpj0pivT/cg0o0SV9xcLS4N5CB6IC GGkh15duJtzrM3+Hqt65Qy8RjueeaaqiFhmhdhUv6aVBBfXHfEiqY5NMdrG5poO/7CGl FFdOibvpXSBDYo9RTmCMlcC+z6A5PHmVwsJTqNtgZtC+9NqmNmCEdDJ0WP1HQZB/oVpa VZsXK7Wuvy/kxqKbRJtNj4IJ0RV2LooLTuKmKxZks+FmQRZtB/5yTJZ7PJnaKayvmvTz yGus4kYOrkO8ZSMQUldCG/SJud0TN82DjsTlhWOSGbfMl6mhrS2lN8FwlJDQLR4Gut6V nLng== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w15si10629773plk.357.2018.12.10.09.58.37; Mon, 10 Dec 2018 09:58:53 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728995AbeLJRRx (ORCPT + 99 others); Mon, 10 Dec 2018 12:17:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50526 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728401AbeLJRNf (ORCPT ); Mon, 10 Dec 2018 12:13:35 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0D1930001DF; Mon, 10 Dec 2018 17:13:35 +0000 (UTC) Received: from horse.redhat.com (unknown [10.18.25.234]) by smtp.corp.redhat.com (Postfix) with ESMTP id 787AA605C5; Mon, 10 Dec 2018 17:13:35 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id B170C224278; Mon, 10 Dec 2018 12:13:30 -0500 (EST) From: Vivek Goyal To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: vgoyal@redhat.com, miklos@szeredi.hu, stefanha@redhat.com, dgilbert@redhat.com, sweil@redhat.com, swhiteho@redhat.com Subject: [PATCH 44/52] fuse: Clear setuid bit even in direct I/O path Date: Mon, 10 Dec 2018 12:13:10 -0500 Message-Id: <20181210171318.16998-45-vgoyal@redhat.com> In-Reply-To: <20181210171318.16998-1-vgoyal@redhat.com> References: <20181210171318.16998-1-vgoyal@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 10 Dec 2018 17:13:35 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With cache=never, we fall back to direct IO. pjdfstest chmod test 12.t was failing because if a file has setuid bit, it should be cleared if an unpriviledged user opens it for write and writes to it. Call fuse_remove_privs() even for direct I/O path. Signed-off-by: Vivek Goyal --- fs/fuse/file.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index cb28cf26a6e7..0be5a7380b3c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1679,13 +1679,25 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from) /* Don't allow parallel writes to the same file */ inode_lock(inode); res = generic_write_checks(iocb, from); - if (res > 0) - res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE); + if (res < 0) + goto out_invalidate; + + res = file_remove_privs(iocb->ki_filp); + if (res) + goto out_invalidate; + + res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE); + if (res < 0) + goto out_invalidate; + fuse_invalidate_attr(inode); - if (res > 0) - fuse_write_update_size(inode, iocb->ki_pos); + fuse_write_update_size(inode, iocb->ki_pos); inode_unlock(inode); + return res; +out_invalidate: + fuse_invalidate_attr(inode); + inode_unlock(inode); return res; } -- 2.13.6