From: Davide Libenzi <davidel@xmailserver.org>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>, Al Viro <viro@ftp.linux.org.uk>,
Michael Kerrisk <mtk.manpages@gmail.com>,
Christoph Hellwig <hch@infradead.org>
Subject: [patch] F_GETPATH implementation
Date: Mon, 14 Apr 2008 12:40:53 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0804141227490.7954@alien.or.mcafeemobile.com> (raw)
This is a small patch to support BSD's F_GETPATH on Linux. I removed the
unneeded export, like Arnd pointed out.
IMO the simplicity of the patch and the portability advantages makes it
worth it. I'll leave to others to further comments it.
Built and tested on my box against 2.6.25-rc9. Simple test program here:
http://www.xmailserver.org/fgetpath-test.c
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
---
fs/fcntl.c | 26 ++++++++++++++++++++++++++
fs/proc/base.c | 26 +-------------------------
include/asm-generic/fcntl.h | 1 +
include/linux/fs.h | 1 +
4 files changed, 29 insertions(+), 25 deletions(-)
Index: linux-2.6.mod/fs/fcntl.c
===================================================================
--- linux-2.6.mod.orig/fs/fcntl.c 2008-04-13 15:01:09.000000000 -0700
+++ linux-2.6.mod/fs/fcntl.c 2008-04-13 18:37:56.000000000 -0700
@@ -316,6 +316,28 @@
return pid;
}
+int fcntl_getpath(struct path *fpath, char __user *path, int maxsize)
+{
+ int size;
+ char *buf, *pathname;
+
+ buf = (char *) __get_free_page(GFP_TEMPORARY);
+ if (!buf)
+ return -ENOMEM;
+ pathname = d_path(fpath, buf, PAGE_SIZE);
+ size = PTR_ERR(pathname);
+ if (IS_ERR(pathname))
+ goto error;
+ size = buf + PAGE_SIZE - 1 - pathname;
+ if (size > maxsize)
+ size = maxsize;
+ if (copy_to_user(path, pathname, size))
+ size = -EFAULT;
+error:
+ free_page((unsigned long) buf);
+ return size;
+}
+
static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
struct file *filp)
{
@@ -381,6 +403,10 @@
case F_NOTIFY:
err = fcntl_dirnotify(fd, filp, arg);
break;
+ case F_GETPATH:
+ err = fcntl_getpath(&filp->f_path, (char __user *) arg,
+ PATH_MAX);
+ break;
default:
break;
}
Index: linux-2.6.mod/include/asm-generic/fcntl.h
===================================================================
--- linux-2.6.mod.orig/include/asm-generic/fcntl.h 2008-04-13 15:01:09.000000000 -0700
+++ linux-2.6.mod/include/asm-generic/fcntl.h 2008-04-13 18:37:35.000000000 -0700
@@ -73,6 +73,7 @@
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
#endif
+#define F_GETPATH 12
/* for F_[GET|SET]FL */
#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
Index: linux-2.6.mod/fs/proc/base.c
===================================================================
--- linux-2.6.mod.orig/fs/proc/base.c 2008-04-13 15:01:09.000000000 -0700
+++ linux-2.6.mod/fs/proc/base.c 2008-04-13 18:37:35.000000000 -0700
@@ -1192,30 +1192,6 @@
return ERR_PTR(error);
}
-static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
-{
- char *tmp = (char*)__get_free_page(GFP_TEMPORARY);
- char *pathname;
- int len;
-
- if (!tmp)
- return -ENOMEM;
-
- pathname = d_path(path, tmp, PAGE_SIZE);
- len = PTR_ERR(pathname);
- if (IS_ERR(pathname))
- goto out;
- len = tmp + PAGE_SIZE - 1 - pathname;
-
- if (len > buflen)
- len = buflen;
- if (copy_to_user(buffer, pathname, len))
- len = -EFAULT;
- out:
- free_page((unsigned long)tmp);
- return len;
-}
-
static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int buflen)
{
int error = -EACCES;
@@ -1230,7 +1206,7 @@
if (error)
goto out;
- error = do_proc_readlink(&path, buffer, buflen);
+ error = fcntl_getpath(&path, buffer, buflen);
path_put(&path);
out:
return error;
Index: linux-2.6.mod/include/linux/fs.h
===================================================================
--- linux-2.6.mod.orig/include/linux/fs.h 2008-04-13 15:01:09.000000000 -0700
+++ linux-2.6.mod/include/linux/fs.h 2008-04-13 18:37:35.000000000 -0700
@@ -960,6 +960,7 @@
/* only for net: no internal synchronization */
extern void __kill_fasync(struct fasync_struct *, int, int);
+extern int fcntl_getpath(struct path *fpath, char __user *path, int maxsize);
extern int __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
next reply other threads:[~2008-04-14 19:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-14 19:40 Davide Libenzi [this message]
2008-04-14 22:48 ` Linus Torvalds
2008-04-14 23:09 ` Davide Libenzi
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=Pine.LNX.4.64.0804141227490.7954@alien.or.mcafeemobile.com \
--to=davidel@xmailserver.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@ftp.linux.org.uk \
/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®