cgroup: fix seq_show_option merge with legacy_name
Subsystems (2)
PATCH 1/1 cgroup: fix seq_show_option merge with legacy_name
When seq_show_option (068acf2ee776) was merged, it did not correctly collide with cgroup's addition of legacy_name (3e1d2eed39d8) changes. This fixes the reported name.
--- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup.c +1 -1
@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq,if (root != &cgrp_dfl_root)for_each_subsys (ss, ssid)if (root->subsys_mask & (1 << ssid)) -seq_show_option (seq, ss->name,NULL ); +seq_show_option (seq, ss->legacy_name,NULL );if (root->flags &CGRP_ROOT_NOPREFIX )seq_puts (seq,",noprefix" );if (root->flags &CGRP_ROOT_XATTR )
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security
Quoted 5 lines · Kees Cook
When
seq_show_option(068acf2ee776) was merged, it did not correctly collide with cgroup's addition oflegacy_name(3e1d2eed39d8) changes. This fixes the reported name.Signed-off-by Kees Cook <[email protected]>
Thanks.
--
tejun
Quoted 5 lines · Kees Cook
When
seq_show_option(068acf2ee776) was merged, it did not correctly collide with cgroup's addition oflegacy_name(3e1d2eed39d8) changes. This fixes the reported name.Signed-off-by Kees Cook <[email protected]>
Quoted 4 lines · Kees Cook
When
seq_show_option(068acf2ee776) was merged, it did not correctly collide with cgroup's addition oflegacy_name(3e1d2eed39d8) changes. This fixes the reported name.
Since a068acf2ee77 ("fs: create and use seq_show_option for escaping") has been CC'ed to stable, shouldn't this be tagged to stable too?
(This is upstream commit 61e57c0c3a37 "cgroup: fix seq_show_option merge with legacy_name".)
Cheers,
--
Luís
Quoted 30 lines
Signed-off-by Kees Cook <[email protected]>--- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/cgroup.c +1
-1@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq,if (root != &cgrp_dfl_root)for_each_subsys (ss, ssid)if (root->subsys_mask & (1 << ssid)) -seq_show_option (seq, ss->name,NULL ); +seq_show_option (seq, ss->legacy_name,NULL );if (root->flags &CGRP_ROOT_NOPREFIX )seq_puts (seq,",noprefix" );if (root->flags &CGRP_ROOT_XATTR )Signature · 11 lines
1.9.1 -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 11 lines · Luis Henriques
Quoted 4 lines · Kees Cook
When
seq_show_option(068acf2ee776) was merged, it did not correctly collide with cgroup's addition oflegacy_name(3e1d2eed39d8) changes. This fixes the reported name.Since
a068acf2ee77("fs: create and useseq_show_optionfor escaping") has been CC'ed to stable, shouldn't this be tagged to stable too?(This is upstream commit
61e57c0c3a37"cgroup: fixseq_show_optionmerge withlegacy_name".)
If the cgroup change when to stable also, then yes.
-Kees
Quoted 35 lines
Cheers,
--
LuÃsQuoted 30 lines
Signed-off-by Kees Cook <[email protected]>--- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/cgroup.c +1
-2@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq,if (root != &cgrp_dfl_root)for_each_subsys (ss, ssid)if (root->subsys_mask & (1 << ssid)) -seq_show_option (seq, ss->name,NULL ); +seq_show_option (seq, ss->legacy_name,NULL );if (root->flags &CGRP_ROOT_NOPREFIX )seq_puts (seq,",noprefix" );if (root->flags &CGRP_ROOT_XATTR ) --1.9.1
--
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 8 lines · Kees Cook
Quoted 6 lines · Luis Henriques
Quoted 4 lines · Kees Cook
When
seq_show_option(068acf2ee776) was merged, it did not correctly collide with cgroup's addition oflegacy_name(3e1d2eed39d8) changes. This fixes the reported name.
Quoted 8 lines
Quoted 5 lines
Since
a068acf2ee77("fs: create and useseq_show_optionfor escaping") has been CC'ed to stable, shouldn't this be tagged to stable too?(This is upstream commit
61e57c0c3a37"cgroup: fixseq_show_optionmerge withlegacy_name".)If the cgroup change when to stable also, then yes.
And this didn't happen, so no need to include this commit. Sorry for the noise.
Cheers,
--
Luís
Quoted 43 lines
-Kees
Quoted 35 lines
Cheers,
--
LuísQuoted 30 lines
Signed-off-by Kees Cook <[email protected]>--- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/cgroup.c +1
-2@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq,if (root != &cgrp_dfl_root)for_each_subsys (ss, ssid)if (root->subsys_mask & (1 << ssid)) -seq_show_option (seq, ss->name,NULL ); +seq_show_option (seq, ss->legacy_name,NULL );if (root->flags &CGRP_ROOT_NOPREFIX )seq_puts (seq,",noprefix" );if (root->flags &CGRP_ROOT_XATTR ) --1.9.1
--
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/Signature · 2 lines
Kees Cook Chrome OS Security