From: Kees Cook <keescook@chromium.org>
To: Danilo Krummrich <danilokrummrich@dk-develop.de>
Cc: "Luis R. Rodriguez" <mcgrof@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table
Date: Tue, 27 Feb 2018 15:02:32 -0800 [thread overview]
Message-ID: <CAGXu5j+geUKNMu8W-+CYUD0_d_LBv+78TE5QbKx2EBeCx_oP9A@mail.gmail.com> (raw)
In-Reply-To: <20180227224358.12672-1-danilokrummrich@dk-develop.de>
On Tue, Feb 27, 2018 at 2:43 PM, Danilo Krummrich
<danilokrummrich@dk-develop.de> 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>
> ---
> 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..a0b6c647835e 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -709,6 +709,9 @@ static bool proc_sys_link_fill_cache(struct file *file,
> bool ret = true;
Nothing appears to actually change "ret" in this function. It should
likely be dropped too.
> head = sysctl_head_grab(head);
>
> + if (IS_ERR(head))
> + return false;
> +
This looks sensible. I'd drop the blank line between sysctl_head_grab
and the IS_ERR, though.
How are you testing this change?
Thanks!
-Kees
> 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);
> --
> 2.14.1
>
--
Kees Cook
Pixel Security
next prev parent reply other threads:[~2018-02-27 23:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-27 22:43 [PATCH 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table Danilo Krummrich
2018-02-27 22:43 ` [PATCH 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache() Danilo Krummrich
2018-02-27 22:59 ` Kees Cook
2018-02-27 23:01 ` Danilo Krummrich
2018-02-27 23:02 ` Kees Cook [this message]
2018-02-27 23:20 ` [PATCH 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table Danilo Krummrich
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=CAGXu5j+geUKNMu8W-+CYUD0_d_LBv+78TE5QbKx2EBeCx_oP9A@mail.gmail.com \
--to=keescook@chromium.org \
--cc=danilokrummrich@dk-develop.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@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).