From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 BD106C352A3 for ; Mon, 10 Feb 2020 12:42:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 866AE20838 for ; Mon, 10 Feb 2020 12:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338528; bh=D6Xx5M7Rs1pV0xGzj0es8MZ19wcAYT/gPZPjlbzvoug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sXvhod/9Kw7gbI7OzIfcwFxTDjztVYq6DTd852EhGlmHMtbTcqlDBNTOsVGJphIjN wdmlkx6CaI2IyqU9YItBVjSQ62FrCqnZYjdYza7tdwJKxNrXCMRGUIXcZBsvd7vJvh eryyKQEy4Xar4ffHwLuxi9qQ7KaTgK9Vd5K/CoF0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730154AbgBJMmH (ORCPT ); Mon, 10 Feb 2020 07:42:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:45824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730152AbgBJMmH (ORCPT ); Mon, 10 Feb 2020 07:42:07 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E11382085B; Mon, 10 Feb 2020 12:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338527; bh=D6Xx5M7Rs1pV0xGzj0es8MZ19wcAYT/gPZPjlbzvoug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T/B1Z0PZc8MugixW6DyuWZMw3cByC1bXIfN+a9j2Dk+og9Xb9REQfCb+avQEkC6ta r9JL5ovAk1loy5o6PalBGzUFjcfJBcAAMjz1XgPZ3Mlaqt7IfQ50aoiwvefD3oHzO4 dNoCvWKfsyEBtIBvzRwEMXWIOg8Ys9gRbjwKeSf8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aurelien Aptel , Steve French , Pavel Shilovsky Subject: [PATCH 5.5 348/367] cifs: fix mode bits from dir listing when mounted with modefromsid Date: Mon, 10 Feb 2020 04:34:21 -0800 Message-Id: <20200210122454.675867923@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aurelien Aptel commit e3e056c35108661e418c803adfc054bf683426e7 upstream. When mounting with -o modefromsid, the mode bits are stored in an ACE. Directory enumeration (e.g. ls -l /mnt) triggers an SMB Query Dir which does not include ACEs in its response. The mode bits in this case are silently set to a default value of 755 instead. This patch marks the dentry created during the directory enumeration as needing re-evaluation (i.e. additional Query Info with ACEs) so that the mode bits can be properly extracted. Quick repro: $ mount.cifs //win19.test/data /mnt -o ...,modefromsid $ touch /mnt/foo && chmod 751 /mnt/foo $ stat /mnt/foo # reports 751 (OK) $ sleep 2 # dentry older than 1s by default get invalidated $ ls -l /mnt # since dentry invalid, ls does a Query Dir # and reports foo as 755 (WRONG) Signed-off-by: Aurelien Aptel Signed-off-by: Steve French CC: Stable Reviewed-by: Pavel Shilovsky Signed-off-by: Greg Kroah-Hartman --- fs/cifs/readdir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -196,7 +196,8 @@ cifs_fill_common_info(struct cifs_fattr * may look wrong since the inodes may not have timed out by the time * "ls" does a stat() call on them. */ - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) + if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) || + (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)) fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL &&