From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: Danilo Krummrich <danilokrummrich@dk-develop.de>
Cc: mcgrof@kernel.org, keescook@chromium.org,
linux-kernel@vger.kernel.org,
Eric Biederman <ebiederm@xmission.com>,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH v2 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table
Date: Wed, 28 Feb 2018 01:09:05 +0000 [thread overview]
Message-ID: <20180228010905.GB14069@wotan.suse.de> (raw)
In-Reply-To: <20180227233156.29826-1-danilokrummrich@dk-develop.de>
On Wed, Feb 28, 2018 at 12:31:55AM +0100, Danilo Krummrich wrote:
> 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.
>
> Signed-off-by: Danilo Krummrich <danilokrummrich@dk-develop.de>
> ---
> v2: removed empty line between between sysctl_head_grab and IS_ERR
Please add a respective tag:
Fixes: 0e47c99d7fe25 ("sysctl: Replace root_list with links between sysctl_table_sets")
And mention this has been present since v3.4. May be worth sending to
stable as well, so peg stable as well.
Luis
> ---
> fs/proc/proc_sysctl.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index c5cbbdff3c3d..82ac5f682b73 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -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
>
>
--
Luis Rodriguez, SUSE LINUX GmbH
Maxfeldstrasse 5; D-90409 Nuernberg
prev parent reply other threads:[~2018-02-28 1:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-27 23:31 [PATCH v2 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table Danilo Krummrich
2018-02-27 23:31 ` [PATCH v2 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache() Danilo Krummrich
2018-02-27 23:41 ` Kees Cook
2018-02-28 1:15 ` Luis R. Rodriguez
2018-02-27 23:39 ` [PATCH v2 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table Kees Cook
2018-02-28 1:09 ` Luis R. Rodriguez [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180228010905.GB14069@wotan.suse.de \
--to=mcgrof@kernel.org \
--cc=danilokrummrich@dk-develop.de \
--cc=ebiederm@xmission.com \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).