From: Danilo Krummrich <danilokrummrich@dk-develop.de>
To: mcgrof@kernel.org, keescook@chromium.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Danilo Krummrich <danilokrummrich@dk-develop.de>
Subject: [PATCH 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache()
Date: Tue, 27 Feb 2018 23:43:58 +0100 [thread overview]
Message-ID: <20180227224358.12672-2-danilokrummrich@dk-develop.de> (raw)
In-Reply-To: <20180227224358.12672-1-danilokrummrich@dk-develop.de>
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);
+ if (err)
+ goto out;
ret = proc_sys_fill_cache(file, ctx, head, table);
out:
--
2.14.1
next prev parent reply other threads:[~2018-02-27 22:50 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 ` Danilo Krummrich [this message]
2018-02-27 22:59 ` [PATCH 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache() Kees Cook
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=20180227224358.12672-2-danilokrummrich@dk-develop.de \
--to=danilokrummrich@dk-develop.de \
--cc=keescook@chromium.org \
--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