read_all: move blacklist to source
PATCH v2 1/2 read_all: move blacklist to source
library doesn't support multiple parameters for same option.
--- runtest/fs | 2 +- testcases/kernel/fs/read_all/read_all.c | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-)
runtest/fs +1 -1
@@ -71,7 +71,7 @@ proc01 proc01 -m 128 read_all_dev read_all -d /dev -p -q -r 10 read_all_proc read_all -d /proc -q -r 10 -read_all_sys read_all -d /sys -q -r 10 -e /sys/power/wakeup_count +read_all_sys read_all -d /sys -q -r 10 #Run the File System Race Condition Check tests as well fs_racer fs_racer.sh -t 5
testcases/kernel/fs/read_all/read_all.c +22 -6
@@ -71,7 +71,6 @@ enum dent_action {static char *verbose;static char *quiet;static char *root_dir; -static char *exclude;static char *str_reads;static int reads =1 ;static char *str_worker_count;
@@ -81,6 +80,11 @@ static long max_workers = 15;static struct worker *workers;static char *drop_privs; +static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +}; +static struct tst_option options[] = { {"v" , &verbose,"-v Print information about successful reads." },
@@ -88,7 +92,7 @@ static struct tst_option options[] = { "-q Don't print file read or open errors."}, {"d:" , &root_dir, "-d path Path to the directory to read from, defaults to /sys."}, - {"e:", &exclude, + {"e:", &blacklist[0], "-e pattern Ignore files which match an 'extended' pattern, see fnmatch(3)."}, {"r:", &str_reads, "-r count The number of times to schedule a file for reading."},
@@ -182,17 +186,29 @@ static void sanitize_str(char *buf, ssize_t count)strcpy (buf +MAX_DISPLAY ,"..." ); } +static int is_blacklisted (const char *path) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (blacklist); i++) { +if (blacklist[i] && !fnmatch (blacklist[i], path,FNM_EXTMATCH )) { +if (verbose) +tst_res (TINFO ,"Ignoring %s" , path); +return 1 ; + } + } + +return 0 ; +} +static void read_test (const char *path) {char buf[BUFFER_SIZE ];int fd;ssize_t count; -if (exclude && !fnmatch (exclude, path,FNM_EXTMATCH )) { -if (verbose) -tst_res (TINFO ,"Ignoring %s" , path); +if (is_blacklisted (path))return ; - }if (verbose)tst_res (TINFO ,"%s(%s)" , __func__, path);
Signature · 1 line
1.8.3.1
PATCH v2 2/2 read_all_sys: skip debugfs
debugfs is meant for debugging, it exposes also device registers and can pretty much do anything:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
https://lore.kernel.org/stable/[email protected]/
--- testcases/kernel/fs/read_all/read_all.c | 1 + 1 file changed, 1 insertion(+)
testcases/kernel/fs/read_all/read_all.c +1 -0
@@ -83,6 +83,7 @@ static char *drop_privs;static char *blacklist[] = {NULL ,/* reserved for -e parameter */ "/sys/power/wakeup_count" , +"/sys/kernel/debug/*" , };static struct tst_option options[] = {
Signature · 1 line
1.8.3.1
PATCH v2 1/2 read_all: move blacklist to source
In reply to Jan StancekPATCH v2 1/2 read_all: move blacklist to source
----- Original Message -----
Quoted 4 lines
Hi!
Reviewed-by Cyril Hrubis <[email protected]>
OK to push both, or is this only for first patch?
PATCH v2 1/2 read_all: move blacklist to source
Hi!
Quoted 1 line
OK to push both, or is this only for first patch?
Both of them, sorry for not being clear.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/2 read_all: move blacklist to source
----- Original Message -----
Quoted 4 lines
Hi!
Quoted 1 line
OK to push both, or is this only for first patch?
Both of them, sorry for not being clear.
Thanks, both pushed.
PATCH v2 1/2 read_all: move blacklist to source
In reply to Jan StancekHello,
Quoted 34 lines · Jan Stancek
library doesn't support multiple parameters for same option.
Signed-off-by Jan Stancek <[email protected]>--- runtest/fs | 2 +- testcases/kernel/fs/read_all/read_all.c | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-)runtest/fs +1
-1@@ -71,7 +71,7 @@ proc01 proc01 -m 128 read_all_dev read_all -d /dev -p -q -r 10 read_all_proc read_all -d /proc -q -r 10 -read_all_sys read_all -d /sys -q -r 10 -e /sys/power/wakeup_count +read_all_sys read_all -d /sys -q -r 10 #Run the File System Race Condition Check tests as well fs_racer fs_racer.sh -t 5testcases/kernel/fs/read_all/read_all.c +0
-1@@ -71,7 +71,6 @@ enum dent_action {static char *verbose;static char *quiet;static char *root_dir; -static char *exclude;static char *str_reads;static int reads =1 ;static char *str_worker_count;
testcases/kernel/fs/read_all/read_all.c static long max_workers = 15; · line 86
Quoted 7 lines
testcases/kernel/fs/read_all/read_all.c +4
-0@@ -81,6 +80,11 @@ static long max_workers = 15;static struct worker *workers;static char *drop_privs; +static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +};
The problem with this is that it is only required if we are running as a privileged user. If -p is specified then it would be a bug if nobody can read from any of these files.
So I guess we could disable the builtin blacklist if drop_privs (switch to nobody) is specified and run this test twice on /sys with and without -p.
Quoted 48 lines
testcases/kernel/fs/read_all/read_all.c +18
-6+static struct tst_option options[] = { {"v" , &verbose,"-v Print information about successful reads." },@@ -88,7 +92,7 @@ static struct tst_option options[] = { "-q Don't print file read or open errors."}, {"d:" , &root_dir, "-d path Path to the directory to read from, defaults to /sys."}, - {"e:", &exclude, + {"e:", &blacklist[0], "-e pattern Ignore files which match an 'extended' pattern, see fnmatch(3)."}, {"r:", &str_reads, "-r count The number of times to schedule a file for reading."},@@ -182,17 +186,29 @@ static void sanitize_str(char *buf, ssize_t count)strcpy (buf +MAX_DISPLAY ,"..." ); } +static int is_blacklisted (const char *path) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (blacklist); i++) { +if (blacklist[i] && !fnmatch (blacklist[i], path,FNM_EXTMATCH )) { +if (verbose) +tst_res (TINFO ,"Ignoring %s" , path); +return 1 ; + } + } + +return 0 ; +} +static void read_test (const char *path) {char buf[BUFFER_SIZE ];int fd;ssize_t count; -if (exclude && !fnmatch (exclude, path,FNM_EXTMATCH )) { -if (verbose) -tst_res (TINFO ,"Ignoring %s" , path); +if (is_blacklisted (path))return ; - }if (verbose)tst_res (TINFO ,"%s(%s)" , __func__, path); --
Quoted 1 line
1.8.3.1
--
Thank you,
Richard.
PATCH v2 1/2 read_all: move blacklist to source
Hi!
Quoted 8 lines
testcases/kernel/fs/read_all/read_all.c static long max_workers = 15; · line 86
Quoted 4 lines
testcases/kernel/fs/read_all/read_all.c +4
-0+static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +};The problem with this is that it is only required if we are running as a privileged user. If -p is specified then it would be a bug if nobody can read from any of these files.
Good point.
Quoted 2 lines
So I guess we could disable the builtin blacklist if
drop_privs(switch to nobody) is specified and run this test twice on /sys with and without
Sounds reasonable, will you send a patch?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/2 read_all: move blacklist to source
hello,
Quoted 10 lines · Cyril Hrubis
Hi!
Quoted 8 lines
testcases/kernel/fs/read_all/read_all.c static long max_workers = 15; · line 86
Quoted 4 lines
testcases/kernel/fs/read_all/read_all.c +4
-0+static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +};The problem with this is that it is only required if we are running as a privileged user. If -p is specified then it would be a bug if nobody can read from any of these files.
Quoted 6 lines
Good point.
Quoted 2 lines
So I guess we could disable the builtin blacklist if
drop_privs(switch to nobody) is specified and run this test twice on /sys with and withoutSounds reasonable, will you send a patch?
Yeah, sure.
Signature · 2 lines
Thank you, Richard.
PATCH v2 1/2 read_all: move blacklist to source
In reply to Richard Palethorpe----- Original Message -----
Quoted 11 lines
testcases/kernel/fs/read_all/read_all.c static long max_workers = 15; · line 86
Quoted 4 lines
testcases/kernel/fs/read_all/read_all.c +4
-0+static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +};The problem with this is that it is only required if we are running as a privileged user. If -p is specified then it would be a bug if nobody can read from any of these files.
So I guess we could disable the builtin blacklist if
drop_privs(switch to nobody) is specified
Good point. I just saw your reply that you plan to send a patch, thank you.
Quoted 2 lines
and run this test twice on /sys with and without
-p.
greg-kh wasn't very happy to hear about privileged runs in the other thread. He was suggesting whitelist approach, but I don't know how we would keep it up to date, deal with different configs, etc.
PATCH v2 1/2 read_all: move blacklist to source
Hello,
Quoted 10 lines · Jan Stancek
----- Original Message -----
Quoted 9 lines
testcases/kernel/fs/read_all/read_all.c static long max_workers = 15; · line 86
Quoted 4 lines
testcases/kernel/fs/read_all/read_all.c +4
-0+static char *blacklist[] = { +NULL ,/* reserved for -e parameter */ +"/sys/power/wakeup_count" , +};The problem with this is that it is only required if we are running as a privileged user. If -p is specified then it would be a bug if nobody can read from any of these files.
Quoted 5 lines
Quoted 2 lines
So I guess we could disable the builtin blacklist if
drop_privs(switch to nobody) is specifiedGood point. I just saw your reply that you plan to send a patch, thank you.
Thanks!
Quoted 7 lines
Quoted 3 lines
and run this test twice on /sys with and without
-p.greg-kh wasn't very happy to hear about privileged runs in the other thread. He was suggesting whitelist approach, but I don't know how we would keep it up to date, deal with different configs, etc.
--
Thank you,
Richard.