From patchwork Fri Apr 7 09:01:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9669137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA0A860364 for ; Fri, 7 Apr 2017 09:01:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7BD526E81 for ; Fri, 7 Apr 2017 09:01:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BB52285C8; Fri, 7 Apr 2017 09:01:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E10426E81 for ; Fri, 7 Apr 2017 09:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756195AbdDGJBu (ORCPT ); Fri, 7 Apr 2017 05:01:50 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:32948 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756087AbdDGJBn (ORCPT ); Fri, 7 Apr 2017 05:01:43 -0400 Received: by mail-wr0-f194.google.com with SMTP id g19so18144608wrb.0; Fri, 07 Apr 2017 02:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OibKhbQrR6TniZok1NDBvvMjZ4tLE7OY8BNfFD6g6ok=; b=hrdIf4c7im3/dPUIqp7EmnrApiWFsXX4iKFZ5OClTZ0SNYf2pPYj5gYnZf42V5KYlP CgMdR37dTHDQsCCk8Li7S/AhugBQaMgnSIQdeo2Hpg5tQxKtAJOV66x5rZctMbmPSFgL /7tf+DikK+rvr6ksbpbxEbN7tK2J8lF4KtEmbIQU3DdeQTY8SygikgusLyPc49M2qyfT JLbgfF+ADsp7zOoZMZ5WIUeGLbvPKKZxAWbUmNPVW6q4KA5Dj5WVWr0ZeEiNa8EVLaVT 2YN0qrD6TS1/EMAqgkyaww+K0gfY4bkPlvPBftbhUP+8d4lDESNUGp+NZ+FHlVpFcJxM yQmw== 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; bh=OibKhbQrR6TniZok1NDBvvMjZ4tLE7OY8BNfFD6g6ok=; b=XLqH+siHIl9zY0eG8ngozSEVMTQRCr3dzkVSI96H1k3RnPLsuK/zvVXBuwnEwsj6oI 67pWYV9HU1HyzpMAbYLIyUpMrB3fcWC8IAz4srgTSFSt4T33k6Xqkq5lMVFpeYRjquXv gmSpynYHIIF+eVXxUdiPQq9YqQn+WsDKinSDFL6EQvOjzoWE8F6Tf94uqpjxbti6xAPS dwEHik6bW7yqpcy/HkyoIipMisWXBfs6Br5Gy+ePvSo6oy0W9/jmAHg6cbWSr7k7Pb+7 SGinuAXwVgDE9O/VXC31lvKsZkWr/RazI9aJtufRPsIlCZGvm1C51xF9FXoewmc+ATY/ MPhw== X-Gm-Message-State: AFeK/H2c/4ZC/PzLj5u+PoEjEymgryPgDXmD1oDc2vhGXBu1yLUeN7a+sF0XdzSmJUTpSQ== X-Received: by 10.223.161.134 with SMTP id u6mr30753656wru.108.1491555702258; Fri, 07 Apr 2017 02:01:42 -0700 (PDT) Received: from amir-VirtualBox.lan (bzq-79-176-107-16.red.bezeqint.net. [79.176.107.16]) by smtp.gmail.com with ESMTPSA id w10sm29422851wmw.14.2017.04.07.02.01.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 02:01:41 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 3/3] ovl: check IS_APPEND() on real upper inode Date: Fri, 7 Apr 2017 12:01:41 +0300 Message-Id: <1491555701-16608-4-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491555701-16608-1-git-send-email-amir73il@gmail.com> References: <1491555701-16608-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For overlay file open, check IS_APPEND() on the real upper inode inside d_real(), because the overlay inode does not have the S_APPEND flag and IS_APPEND() can only be checked at open time. Note that because overlayfs does not copy up the chattr inode flags (i.e. S_APPEND, S_IMMUTABLE), the IS_APPEND() check is only relevant for upper inodes that were set with chattr +a and not to lower inodes that had chattr +a before copy up. Signed-off-by: Amir Goldstein --- fs/overlayfs/super.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index c9e70d3..13806b8 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -49,11 +49,30 @@ static void ovl_dentry_release(struct dentry *dentry) } } +static int ovl_may_open(struct dentry *dentry, int flag) +{ + struct inode *inode = dentry->d_inode; + + /* + * This test was moot in vfs may_open() because overlay inode does + * not have the S_APPEND flag + */ + if (IS_APPEND(inode)) { + if ((flag & O_ACCMODE) != O_RDONLY && !(flag & O_APPEND)) + return -EPERM; + if (flag & O_TRUNC) + return -EPERM; + } + + return 0; +} + static struct dentry *ovl_d_real(struct dentry *dentry, const struct inode *inode, unsigned int open_flags) { struct dentry *real; + int err; if (!d_is_reg(dentry)) { if (!inode || inode == d_inode(dentry)) @@ -65,15 +84,20 @@ static struct dentry *ovl_d_real(struct dentry *dentry, return dentry; if (open_flags) { - int err = ovl_open_maybe_copy_up(dentry, open_flags); - + err = ovl_open_maybe_copy_up(dentry, open_flags); if (err) return ERR_PTR(err); } real = ovl_dentry_upper(dentry); - if (real && (!inode || inode == d_inode(real))) + if (real && (!inode || inode == d_inode(real))) { + if (!inode) { + err = ovl_may_open(real, open_flags); + if (err) + return ERR_PTR(err); + } return real; + } real = ovl_dentry_lower(dentry); if (!real)