Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1606050ybb; Thu, 9 Apr 2020 05:40:01 -0700 (PDT) X-Google-Smtp-Source: APiQypKmpooCocBB6yWw7xKQvdbP0lxSmOLrXDYJR2oFPMFrJX+3Qt03b5suHwRfookuNc7h4XGb X-Received: by 2002:a37:6191:: with SMTP id v139mr5480010qkb.469.1586436001025; Thu, 09 Apr 2020 05:40:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586436001; cv=none; d=google.com; s=arc-20160816; b=CLkc0PGOrk6+GT2DvbKEwxWXWbbVAr3PYqgB6/rCQCNfj/ts+13drRHaE+BjDu7WH1 xOm0UBRVDPNPwvbAtS+pCwEXcNKRSxPPkzHJFGf3aSZMTdpqAPOgeW5jl/IQ8MYNo8X3 lxTFJMSt8z5VsXyMaIkYz/TcrRh/rnG5dkkU3LrLxRrSp8pStTbbng8JvE2gxDQSvEEv Vx0i3onkPZLpFix/m3V98HaSRdPzEulqzev7UVbsuEiqxOpuWxH7m0u+M8O5Ur/3DnHX sLbWAFhd9v+aThBRxa1Dw0u+mvPAGwYFWJ7SVcpTWqDSy7AfLdgU/+ZyZ733QWWsn+0Z YTwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pbTj3b+ZTtuX6pd8egkwXuWgMO+31C2xF4TUHn33yOo=; b=HhvvU8kBna7bTsmhTJBN9RP7Akar/ht7QkSEF4++cApBlodplBrFCH0sHDgoYqfyZQ rAklRI7dRWrYq0QwPbbuMsnyOIPtSCq7kIwWz8Ylv6LBIIfP3PAq7SCEZZIMhlfevIZ9 QnlvnBKDm00jG58Eq/L+cvRPf/iBEBVm0hTb/jAUJnm8AMTMbA8rTq5xXRqFL0ehikl0 485O2vfrUC04uEAzqH5YanENm6THuxnb31bByCbv/UiJrkw8h+OT9bL7nwzhtr8fihzf cQ4IlfLsM+XVgxxwmJ5Qit7iKBq1zwDdx29zUaSIbFCrYQyoLd6YZzSTvJFo0OyyDu0k ZUuw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b12si4413403qtc.212.2020.04.09.05.39.45; Thu, 09 Apr 2020 05:40:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726756AbgDIMiz (ORCPT + 99 others); Thu, 9 Apr 2020 08:38:55 -0400 Received: from raptor.unsafe.ru ([5.9.43.93]:58672 "EHLO raptor.unsafe.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725970AbgDIMiu (ORCPT ); Thu, 9 Apr 2020 08:38:50 -0400 Received: from comp-core-i7-2640m-0182e6.redhat.com (ip-89-102-33-211.net.upcbroadband.cz [89.102.33.211]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by raptor.unsafe.ru (Postfix) with ESMTPSA id B4116209DC; Thu, 9 Apr 2020 12:38:46 +0000 (UTC) From: Alexey Gladkov To: LKML Cc: Kernel Hardening , Linux API , Linux FS Devel , Linux Security Module , Akinobu Mita , Alexander Viro , Alexey Dobriyan , Alexey Gladkov , Andrew Morton , Andy Lutomirski , Daniel Micay , Djalal Harouni , "Dmitry V . Levin" , "Eric W . Biederman" , Greg Kroah-Hartman , Ingo Molnar , "J . Bruce Fields" , Jeff Layton , Jonathan Corbet , Kees Cook , Linus Torvalds , Oleg Nesterov , David Howells Subject: [PATCH RESEND v11 8/8] proc: use named enums for better readability Date: Thu, 9 Apr 2020 14:37:52 +0200 Message-Id: <20200409123752.1070597-9-gladkov.alexey@gmail.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200409123752.1070597-1-gladkov.alexey@gmail.com> References: <20200409123752.1070597-1-gladkov.alexey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.1 (raptor.unsafe.ru [5.9.43.93]); Thu, 09 Apr 2020 12:38:47 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Alexey Gladkov Reviewed-by: Alexey Dobriyan Reviewed-by: Kees Cook --- fs/proc/base.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/root.c | 4 ++-- include/linux/proc_fs.h | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 1ebe9eba48ea..2f2f7b36c947 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -699,7 +699,7 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr) */ static bool has_pid_permissions(struct proc_fs_info *fs_info, struct task_struct *task, - int hide_pid_min) + enum proc_hidepid hide_pid_min) { /* * If 'hidpid' mount option is set force a ptrace check, diff --git a/fs/proc/inode.c b/fs/proc/inode.c index d38a9e592352..8f3681723108 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -166,7 +166,7 @@ void proc_invalidate_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock deactivate_super(old_sb); } -static inline const char *hidepid2str(int v) +static inline const char *hidepid2str(enum proc_hidepid v) { switch (v) { case HIDEPID_OFF: return "off"; diff --git a/fs/proc/root.c b/fs/proc/root.c index c6caae9e4308..9d6ce3710f4f 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -32,9 +32,9 @@ struct proc_fs_context { struct proc_fs_info *fs_info; unsigned int mask; - int hidepid; + enum proc_hidepid hidepid; int gid; - int pidonly; + enum proc_pidonly pidonly; }; enum proc_param { diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index afd38cae2339..3701f49eb299 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -28,7 +28,7 @@ struct proc_ops { }; /* definitions for hide_pid field */ -enum { +enum proc_hidepid { HIDEPID_OFF = 0, HIDEPID_NO_ACCESS = 1, HIDEPID_INVISIBLE = 2, @@ -36,7 +36,7 @@ enum { }; /* definitions for proc mount option pidonly */ -enum { +enum proc_pidonly { PROC_PIDONLY_OFF = 0, PROC_PIDONLY_ON = 1, }; @@ -46,8 +46,8 @@ struct proc_fs_info { struct dentry *proc_self; /* For /proc/self */ struct dentry *proc_thread_self; /* For /proc/thread-self */ kgid_t pid_gid; - int hide_pid; - int pidonly; + enum proc_hidepid hide_pid; + enum proc_pidonly pidonly; }; static inline struct proc_fs_info *proc_sb_info(struct super_block *sb) -- 2.25.2