[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALYGNiPs0kg7b0XKp-_Zx=wB9uPa067R6va8y54r6QuUJ_pYxg@mail.gmail.com>
Date: Thu, 14 Apr 2016 15:34:26 +0300
From: Konstantin Khlebnikov <koct9i@...il.com>
To: "Richard W.M. Jones" <rjones@...hat.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Jonathan Corbet <corbet@....net>,
Andrew Morton <akpm@...ux-foundation.org>,
Vlastimil Babka <vbabka@...e.cz>,
Michal Hocko <mhocko@...e.com>,
Hugh Dickins <hughd@...gle.com>, chenhanxiao@...fujitsu.com,
Naoya Horiguchi <n-horiguchi@...jp.nec.com>,
ross.zwisler@...ux.intel.com, John Stultz <john.stultz@...aro.org>,
Minchan Kim <minchan@...nel.org>,
Jerome Marchand <jmarchan@...hat.com>,
Johannes Weiner <hannes@...xchg.org>, nathans@...hat.com,
andriy.shevchenko@...ux.intel.com,
Kees Cook <keescook@...omium.org>,
Cyrill Gorcunov <gorcunov@...nvz.org>,
Joe Perches <joe@...ches.com>, linux@...musvillemoes.dk,
Ingo Molnar <mingo@...nel.org>, cmetcalf@...hip.com,
iago@...ocode.com, luto@...nel.org, linux-doc@...r.kernel.org,
Cyrill Gorcunov <gorcunov@...il.com>, fw@...eb.enyo.de,
walters@...bum.org
Subject: Re: [PATCH v2] procfs: expose umask in /proc/<PID>/status
On Thu, Apr 14, 2016 at 2:08 PM, Richard W.M. Jones <rjones@...hat.com> wrote:
> It's not possible to read the process umask without also modifying it,
> which is what umask(2) does. A library cannot read umask safely,
> especially if the main program might be multithreaded.
>
> Add a new status line ("Umask") in /proc/<PID>/status. It contains
> the file mode creation mask (umask) in octal. It is only shown for
> tasks which have task->fs.
>
> This patch is adapted from one originally written by Pierre Carrier.
>
> Signed-off-by: Richard W.M. Jones <rjones@...hat.com>
Acked-by: Konstantin Khlebnikov <koct9i@...il.com>
> ---
> Documentation/filesystems/proc.txt | 1 +
> fs/proc/array.c | 20 +++++++++++++++++++-
> 2 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
> index 7f5607a..e8d0075 100644
> --- a/Documentation/filesystems/proc.txt
> +++ b/Documentation/filesystems/proc.txt
> @@ -225,6 +225,7 @@ Table 1-2: Contents of the status files (as of 4.1)
> TracerPid PID of process tracing this process (0 if not)
> Uid Real, effective, saved set, and file system UIDs
> Gid Real, effective, saved set, and file system GIDs
> + Umask file mode creation mask
> FDSize number of file descriptor slots currently allocated
> Groups supplementary group list
> NStgid descendant namespace thread group ID hierarchy
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index b6c00ce..88c7de1 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -83,6 +83,7 @@
> #include <linux/tracehook.h>
> #include <linux/string_helpers.h>
> #include <linux/user_namespace.h>
> +#include <linux/fs_struct.h>
>
> #include <asm/pgtable.h>
> #include <asm/processor.h>
> @@ -139,12 +140,25 @@ static inline const char *get_task_state(struct task_struct *tsk)
> return task_state_array[fls(state)];
> }
>
> +static inline int get_task_umask(struct task_struct *tsk)
> +{
> + struct fs_struct *fs;
> + int umask = -ENOENT;
> +
> + task_lock(tsk);
> + fs = tsk->fs;
> + if (fs)
> + umask = fs->umask;
> + task_unlock(tsk);
> + return umask;
> +}
> +
> static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
> struct pid *pid, struct task_struct *p)
> {
> struct user_namespace *user_ns = seq_user_ns(m);
> struct group_info *group_info;
> - int g;
> + int g, umask;
> struct task_struct *tracer;
> const struct cred *cred;
> pid_t ppid, tpid = 0, tgid, ngid;
> @@ -162,6 +176,10 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
> ngid = task_numa_group_id(p);
> cred = get_task_cred(p);
>
> + umask = get_task_umask(p);
> + if (umask >= 0)
> + seq_printf(m, "Umask:\t%#04o\n", umask);
> +
> task_lock(p);
> if (p->files)
> max_fds = files_fdtable(p->files)->max_fds;
> --
> 2.7.4
>
Powered by blists - more mailing lists