From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbeB1Bff (ORCPT ); Tue, 27 Feb 2018 20:35:35 -0500 Received: from hs01.dk-develop.de ([213.136.71.231]:43619 "EHLO hs01.dk-develop.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751827AbeB1BfO (ORCPT ); Tue, 27 Feb 2018 20:35:14 -0500 From: Danilo Krummrich To: mcgrof@kernel.org, keescook@chromium.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v3 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache() Date: Wed, 28 Feb 2018 02:35:06 +0100 Message-Id: <20180228013506.4915-2-danilokrummrich@dk-develop.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180228013506.4915-1-danilokrummrich@dk-develop.de> References: <20180228013506.4915-1-danilokrummrich@dk-develop.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org proc_sys_link_fill_cache() does not need to check whether we're called for a link - it's already done by scan(). Acked-by: Kees Cook Signed-off-by: Danilo Krummrich --- v2: removed 'err' as it's only used for sysctl_follow_link() v3: add ack --- fs/proc/proc_sysctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 82ac5f682b73..d36ef667c0a8 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -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