Skip to contentSkip to conversation

cgroup: fix seq_show_option merge with legacy_name

PATCH In review Kees Cook 4 participants 6 messages Sep 8, 2015 – Sep 25, 2015

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

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
index a8538e443784..2cf0f79f1fc9 100644
@@ -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
#3 lore raw
In reply to Kees Cook
Quoted 4 lines · Kees Cook

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.

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
---
 kernel/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup.c +1 -1
index a8538e443784..2cf0f79f1fc9 100644
@@ -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/
author
#4 lore raw
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 of legacy_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".)

If the cgroup change when to stable also, then yes.

-Kees

Quoted 35 lines

Cheers,
--
Luís

Quoted 30 lines
---
 kernel/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup.c +1 -2
index a8538e443784..2cf0f79f1fc9 100644
@@ -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
#5 lore raw
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 of legacy_name (3e1d2eed39d8) changes. This fixes the reported name.

Quoted 8 lines
Quoted 5 lines

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".)

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ís

Quoted 30 lines
---
 kernel/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup.c +1 -2
index a8538e443784..2cf0f79f1fc9 100644
@@ -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