Re: [PATCH 1/2] cifs: Fix unix perm bits to cifsacl conversion for "other" bits.

[Shyam Prasad N <nspmangalore@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]

Hi Steve,

It looks like the first patch I sent (above) was not the latest version.
I found it when testing one other cifsacl patch today.

Attached the fix for this bug.

Also attached xfstest for verifying that it works.
@Aurélien Aptel could you please review the test and add it to the
buildbot for cifsacl and modefromsid? When none of those two are used,
the test will fail.

Regards,
Shyam

On Mon, Nov 9, 2020 at 9:46 AM Shyam Prasad N <nspmangalore@gmail.com> wrote:
>
> Also attaching the sticky bit implementation.
> Have tested out some positive and negative test cases too. Works well,
> from what I can tell.
>
> Regards,
> Shyam
>
> On Mon, Nov 9, 2020 at 11:12 PM Shyam Prasad N <nspmangalore@gmail.com> wrote:
> >
> > Hi Steve,
> >
> > Here's the patch as per the discussion. I'm trying to maintain a
> > preferred order of ACEs as much as possible. I had to modify the
> > reverse conversion logic, since deny ACEs can appear in the middle of
> > the list now.
> >
> > Tested thoroughly with many permission modes, conversions and reverse
> > conversions.
> >
> > FYI, there's a sticky bit implementation which I've patched on top of
> > this fix. Will send that for review soon.
> >
> > --
> > -Shyam
>
>
>
> --
> -Shyam



-- 
Regards,
Shyam

[-- Attachment #2: 0001-cifs-Fix-cifsacl-ACE-mask-for-group-and-others.patch --]
[-- Type: application/octet-stream, Size: 918 bytes --]

From 91d547850f6ae304719f1847e724019cae6ec850 Mon Sep 17 00:00:00 2001
From: Shyam Prasad N <sprasad@microsoft.com>
Date: Sun, 21 Feb 2021 08:21:25 +0000
Subject: [PATCH] cifs: Fix cifsacl ACE mask for group and others.

A two line fix which I made while testing my prev fix with
cifsacl mode conversions seem to have gone missing in the final fix
that was submitted. This is that fix.

Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
---
 fs/cifs/cifsacl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index ff7fd0862e28..d9e704979d99 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -31,8 +31,8 @@
 #define EXEC_BIT        0x1
 
 #define ACL_OWNER_MASK 0700
-#define ACL_GROUP_MASK 0770
-#define ACL_EVERYONE_MASK 0777
+#define ACL_GROUP_MASK 0070
+#define ACL_EVERYONE_MASK 0007
 
 #define UBITSHIFT	6
 #define GBITSHIFT	3
-- 
2.25.1


[-- Attachment #3: 002-modecheck.out --]
[-- Type: application/octet-stream, Size: 103 bytes --]

QA output created by 002-modecheck
creating files...
sleeping for 20s...
checking modebits...
success!

[-- Attachment #4: 002-modecheck --]
[-- Type: application/octet-stream, Size: 1591 bytes --]

#! /bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2021 YOUR NAME HERE.  All Rights Reserved.
#
# FS QA Test 002-modecheck
#
# what am I here for?
#
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"

here=`pwd`
tmp=/tmp/$$
status=1	# failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15

_cleanup()
{
	cd /
	rm -f $tmp.*
}

# get standard environment, filters and checks
. ./common/rc
. ./common/filter

# remove previous $seqres.full before test
rm -f $seqres.full

# real QA test starts here

# Modify as appropriate.
_supported_fs generic
_require_test

echo "creating files..."
i=0
mode=0
while [ $mode -lt 0777 ]; do
        filename=$(printf 'modecheck-file-0%o' $mode)
        touch $filename
        chmod $(printf '0%o' $mode) $filename
        # checking for all possible values is too time consuming
        # incrementing by 5 covers most values
        mode=$((mode+5))
        i=$((i+1))
done
total=$i

echo "sleeping for 20s..."
# actimeo has to be lesser than the sleep below
sleep 20

echo "checking modebits..."
i=0
for filename in $(ls modecheck-file-*); do
        exp_mode=$(($(echo $filename|sed 's/modecheck-file-//')))
        mode=$((8#$(stat --printf="%a\n" $filename)))
        if [ $mode -ne $exp_mode ]; then
                echo "Unexpected mode $mode for file $filename. Expected: $exp_mode"
                exit
        fi
        i=$((i+1))
done

if [ $i -ne $total ]; then
        echo "Unexpected number of files: $i. Expected: $total"
        exit
fi

echo "success!"

# success, all done
status=0
exit