mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Richard W.M. Jones" <rjones@redhat.com>
To: corbet@lwn.net
Cc: akpm@linux-foundation.org, vbabka@suse.cz, mhocko@suse.com,
	hughd@google.com, koct9i@gmail.com, chenhanxiao@cn.fujitsu.com,
	n-horiguchi@ah.jp.nec.com, ross.zwisler@linux.intel.com,
	john.stultz@linaro.org, minchan@kernel.org, jmarchan@redhat.com,
	hannes@cmpxchg.org, nathans@redhat.com,
	andriy.shevchenko@linux.intel.com, keescook@chromium.org,
	gorcunov@openvz.org, joe@perches.com, linux@rasmusvillemoes.dk,
	mingo@kernel.org, cmetcalf@ezchip.com, iago@endocode.com,
	luto@kernel.org, linux-doc@vger.kernel.org,
	linux-kernel@vger.kernel.org, gorcunov@gmail.com,
	fw@deneb.enyo.de, walters@verbum.org
Subject: [PATCH] procfs: expose umask in /proc/<PID>/status
Date: Thu, 14 Apr 2016 10:34:49 +0100	[thread overview]
Message-ID: <1460626489-31932-2-git-send-email-rjones@redhat.com> (raw)
In-Reply-To: <1460626489-31932-1-git-send-email-rjones@redhat.com>

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@redhat.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..03e8d3f 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:\t0%o\n", umask);
+
 	task_lock(p);
 	if (p->files)
 		max_fds = files_fdtable(p->files)->max_fds;
-- 
2.7.4

  reply	other threads:[~2016-04-14  9:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14  9:34 [PATCH] procfs: expose umask in /proc/<PID>/status (formerly umask2, formerly getumask) Richard W.M. Jones
2016-04-14  9:34 ` Richard W.M. Jones [this message]
2016-04-14 10:21   ` [PATCH] procfs: expose umask in /proc/<PID>/status Jerome Marchand
2016-04-14  9:36 ` [PATCH] procfs: expose umask in /proc/<PID>/status (formerly umask2, formerly getumask) Richard W.M. Jones

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=1460626489-31932-2-git-send-email-rjones@redhat.com \
    --to=rjones@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=chenhanxiao@cn.fujitsu.com \
    --cc=cmetcalf@ezchip.com \
    --cc=corbet@lwn.net \
    --cc=fw@deneb.enyo.de \
    --cc=gorcunov@gmail.com \
    --cc=gorcunov@openvz.org \
    --cc=hannes@cmpxchg.org \
    --cc=hughd@google.com \
    --cc=iago@endocode.com \
    --cc=jmarchan@redhat.com \
    --cc=joe@perches.com \
    --cc=john.stultz@linaro.org \
    --cc=keescook@chromium.org \
    --cc=koct9i@gmail.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=luto@kernel.org \
    --cc=mhocko@suse.com \
    --cc=minchan@kernel.org \
    --cc=mingo@kernel.org \
    --cc=n-horiguchi@ah.jp.nec.com \
    --cc=nathans@redhat.com \
    --cc=ross.zwisler@linux.intel.com \
    --cc=vbabka@suse.cz \
    --cc=walters@verbum.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

all inboxes | Powered by JetHome®