| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 14 Apr 2008 17:35:33 -0700 (PDT)
From: Davide Libenzi <davidel@...ilserver.org>
To: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Arnd Bergmann <arnd@...db.de>, Al Viro <viro@....linux.org.uk>,
Michael Kerrisk <mtk.manpages@...il.com>,
Christoph Hellwig <hch@...radead.org>
Subject: [patch] F_GETPATH implementation (rev 2)
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 <davidel@...ilserver.org>
- 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists