fs/sysctl: fix potential page fault while unregistering sysctl table
Subsystems (3)
PATCH v2 1/2 fs/sysctl: fix potential page fault while unregistering sysctl table
proc_sys_link_fill_cache() does not take currently unregistering sysctl tables into account, which might result into a page fault in sysctl_follow_link() - add a check to fix it.
---
v2: removed empty line between between sysctl_head_grab and IS_ERR
--- fs/proc/proc_sysctl.c | 3 +++ 1 file changed, 3 insertions(+)
fs/proc/proc_sysctl.c +3 -0
@@ -707,7 +707,10 @@ static bool proc_sys_link_fill_cache(struct file *file, struct ctl_table *table) {bool ret = true; + head =sysctl_head_grab (head); +if (IS_ERR (head)) +return false;if (S_ISLNK (table->mode)) {/* It is not an error if we can not follow the link ignore it */
Signature · 1 line
2.14.1
PATCH v2 2/2 fs/sysctl: remove redundant link check in proc_sys_link_fill_cache()
proc_sys_link_fill_cache() does not need to check whether we're called for a link - it's already done by scan().
---
v2: removed 'err' as it's only used for sysctl_follow_link()
--- fs/proc/proc_sysctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
fs/proc/proc_sysctl.c +3 -6
@@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(struct file *file,if (IS_ERR (head))return false; -if (S_ISLNK (table->mode)) { -/* It is not an error if we can not follow the link ignore it */ -int err =sysctl_follow_link (&head, &table); -if (err) - goto out; - } +/* It is not an error if we can not follow the link ignore it */ +if (sysctl_follow_link (&head, &table)) + goto out; ret =proc_sys_fill_cache (file, ctx, head, table); out:
Signature · 1 line
2.14.1
Re: [PATCH v2 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache()
Quoted 4 lines · Danilo Krummrich
proc_sys_link_fill_cache()does not need to check whether we're called for a link - it's already done byscan().Signed-off-by Danilo Krummrich <[email protected]>
Quoted 2 lines
---
v2: removed 'err' as it's only used forsysctl_follow_link()
Thanks :)
Luis, do you have a tree for sysctl, or should these just go via -mm?
-Kees
Quoted 27 lines
--- fs/proc/proc_sysctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)fs/proc/proc_sysctl.c +3
-7@@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(struct file *file,if (IS_ERR (head))return false; -if (S_ISLNK (table->mode)) { -/* It is not an error if we can not follow the link ignore it */ -int err =sysctl_follow_link (&head, &table); -if (err) - goto out; - } +/* It is not an error if we can not follow the link ignore it */ +if (sysctl_follow_link (&head, &table)) + goto out; ret =proc_sys_fill_cache (file, ctx, head, table); out: --2.14.1
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH v2 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache()
Quoted 7 lines · Kees Cook
Quoted 4 lines · Danilo Krummrich
proc_sys_link_fill_cache()does not need to check whether we're called for a link - it's already done byscan().Signed-off-by Danilo Krummrich <[email protected]>
Quoted 8 lines
Acked-by Kees Cook <[email protected]>Quoted 2 lines
---
v2: removed 'err' as it's only used forsysctl_follow_link()Thanks :)
Luis, do you have a tree for sysctl, or should these just go via -mm?
-mm has been working beautifully so far.
Now that acks have been collected, Danilo, can you also add the other tags mentioned and resubmit and add [email protected] ?
Luis
Quoted 5 lines · Danilo Krummrich
proc_sys_link_fill_cache()does not take currently unregistering sysctl tables into account, which might result into a page fault insysctl_follow_link()- add a check to fix it.Signed-off-by Danilo Krummrich <[email protected]>
Quoted 2 lines
---
v2: removed empty line between betweensysctl_head_grabandIS_ERR
Thanks!
-Kees
Quoted 22 lines
--- fs/proc/proc_sysctl.c | 3 +++ 1 file changed, 3 insertions(+)fs/proc/proc_sysctl.c +3
-1@@ -707,7 +707,10 @@ static bool proc_sys_link_fill_cache(struct file *file, struct ctl_table *table) {bool ret = true; + head =sysctl_head_grab (head); +if (IS_ERR (head)) +return false;if (S_ISLNK (table->mode)) {/* It is not an error if we can not follow the link ignore it */ --2.14.1
Signature · 2 lines
Kees Cook Pixel Security
Quoted 7 lines · Danilo Krummrich
proc_sys_link_fill_cache()does not take currently unregistering sysctl tables into account, which might result into a page fault insysctl_follow_link()- add a check to fix it.Signed-off-by Danilo Krummrich <[email protected]>---
v2: removed empty line between betweensysctl_head_grabandIS_ERR
Please add a respective tag:
And mention this has been present since v3.4. May be worth sending to stable as well, so peg stable as well.
Luis
Quoted 23 lines
--- fs/proc/proc_sysctl.c | 3 +++ 1 file changed, 3 insertions(+)fs/proc/proc_sysctl.c +3
-0@@ -707,7 +707,10 @@ static bool proc_sys_link_fill_cache(struct file *file, struct ctl_table *table) {bool ret = true; + head =sysctl_head_grab (head); +if (IS_ERR (head)) +return false;if (S_ISLNK (table->mode)) {/* It is not an error if we can not follow the link ignore it */ Signature · 1 line
2.14.1
Signature · 2 lines
Luis Rodriguez, SUSE LINUX GmbH Maxfeldstrasse 5; D-90409 Nuernberg