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 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache()
Date: Tue, 27 Feb 2018 14:59:33 -0800 [thread overview]
Message-ID: <CAGXu5jKpmw2qEqL7dnELS5h45pq9AZf=0nEXox52qEbP6pz4CA@mail.gmail.com> (raw)
In-Reply-To: <20180227224358.12672-2-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 need to check whether we're
> called for a link - it's already done by scan().
>
> Signed-off-by: Danilo Krummrich <danilokrummrich@dk-develop.de>
> ---
> fs/proc/proc_sysctl.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index a0b6c647835e..7e7d9facb842 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -707,17 +707,16 @@ static bool proc_sys_link_fill_cache(struct file *file,
> struct ctl_table *table)
> {
> bool ret = true;
> + int err = 0;
> 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 */
> - 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 */
> + sysctl_follow_link(&head, &table);
Shouldn't this be err = sysctl_follow_link... ? Otherwise I don't see
where err is used.
-Kees
> + if (err)
> + goto out;
>
> ret = proc_sys_fill_cache(file, ctx, head, table);
> out:
> --
> 2.14.1
>
--
Kees Cook
Pixel Security
next prev parent reply other threads:[~2018-02-27 22:59 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 [this message]
2018-02-27 23:01 ` Danilo Krummrich
2018-02-27 23:02 ` [PATCH 1/2] fs/sysctl: fix potential page fault while unregistering sysctl table Kees Cook
2018-02-27 23:20 ` 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='CAGXu5jKpmw2qEqL7dnELS5h45pq9AZf=0nEXox52qEbP6pz4CA@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).