From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762684AbYDOAfr (ORCPT ); Mon, 14 Apr 2008 20:35:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757588AbYDOAfk (ORCPT ); Mon, 14 Apr 2008 20:35:40 -0400 Received: from x35.xmailserver.org ([64.71.152.41]:47982 "EHLO x35.xmailserver.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757113AbYDOAfj (ORCPT ); Mon, 14 Apr 2008 20:35:39 -0400 X-AuthUser: davidel@xmailserver.org Date: Mon, 14 Apr 2008 17:35:33 -0700 (PDT) From: Davide Libenzi X-X-Sender: davide@alien.or.mcafeemobile.com To: Linux Kernel Mailing List cc: Linus Torvalds , Andrew Morton , Arnd Bergmann , Al Viro , Michael Kerrisk , Christoph Hellwig Subject: [patch] F_GETPATH implementation (rev 2) Message-ID: X-GPG-FINGRPRINT: CFAE 5BEE FD36 F65E E640 56FE 0974 BF23 270F 474E X-GPG-PUBLIC_KEY: http://www.xmailserver.org/davidel.asc MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a small patch to support BSD's F_GETPATH on Linux. 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 Changes from the initial post: - Removed the un-needed export (Arnd) - Moved F_GETPATH definition inside the Linux specific range (Linus) Signed-off-by: Davide Libenzi - Davide --- fs/fcntl.c | 26 ++++++++++++++++++++++++++ fs/proc/base.c | 26 +------------------------- include/linux/fcntl.h | 13 ++++++++----- include/linux/fs.h | 1 + 4 files changed, 36 insertions(+), 30 deletions(-) Index: linux-2.6.mod/fs/fcntl.c =================================================================== --- linux-2.6.mod.orig/fs/fcntl.c 2008-04-14 13:17:37.000000000 -0700 +++ linux-2.6.mod/fs/fcntl.c 2008-04-14 16:01:32.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/fs/proc/base.c =================================================================== --- linux-2.6.mod.orig/fs/proc/base.c 2008-04-14 13:17:37.000000000 -0700 +++ linux-2.6.mod/fs/proc/base.c 2008-04-14 16:01:32.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-14 13:17:37.000000000 -0700 +++ linux-2.6.mod/include/linux/fs.h 2008-04-14 16:01:32.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); Index: linux-2.6.mod/include/linux/fcntl.h =================================================================== --- linux-2.6.mod.orig/include/linux/fcntl.h 2008-04-14 16:04:31.000000000 -0700 +++ linux-2.6.mod/include/linux/fcntl.h 2008-04-14 16:06:31.000000000 -0700 @@ -7,6 +7,12 @@ #define F_GETLEASE (F_LINUX_SPECIFIC_BASE + 1) /* + * Request nofications on a directory. + * See below for events that may be notified. + */ +#define F_NOTIFY (F_LINUX_SPECIFIC_BASE+2) + +/* * Cancel a blocking posix lock; internal use only until we expose an * asynchronous lock api to userspace: */ @@ -15,11 +21,8 @@ /* Create a file descriptor with FD_CLOEXEC set. */ #define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6) -/* - * Request nofications on a directory. - * See below for events that may be notified. - */ -#define F_NOTIFY (F_LINUX_SPECIFIC_BASE+2) +/* Retrieve the path associated with the file descriptor */ +#define F_GETPATH (F_LINUX_SPECIFIC_BASE+7) /* * Types of directory notifications that may be requested.