Commit 07ce6ac0 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] devfs mount-time readdir fix and cleanup

Patch from Adam J. Richter <adam@yggdrasil.com> and
           Milton Miller <miltonm@bga.com>

There's some init-time code which is supposed to read a devfs directory by
expanding the bufer until the whole directory fits.  But the logic is wrong
and it only works if the whole directory fits into 512 bytes.

So fix that up, and also clean up some coding in there, and rationalise the
duplicated definition of linux_dirent64.
parent 0d5f0a37
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/file.h> #include <linux/file.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/dirent.h>
#include <linux/security.h> #include <linux/security.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -194,17 +195,6 @@ asmlinkage long sys_getdents(unsigned int fd, void * dirent, unsigned int count) ...@@ -194,17 +195,6 @@ asmlinkage long sys_getdents(unsigned int fd, void * dirent, unsigned int count)
return error; return error;
} }
/*
* And even better one including d_type field and 64bit d_ino and d_off.
*/
struct linux_dirent64 {
u64 d_ino;
s64 d_off;
unsigned short d_reclen;
unsigned char d_type;
char d_name[0];
};
#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1)) #define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
struct getdents_callback64 { struct getdents_callback64 {
......
...@@ -16,4 +16,17 @@ struct dirent64 { ...@@ -16,4 +16,17 @@ struct dirent64 {
char d_name[256]; char d_name[256];
}; };
#ifdef __KERNEL__
struct linux_dirent64 {
u64 d_ino;
s64 d_off;
unsigned short d_reclen;
unsigned char d_type;
char d_name[0];
};
#endif /* __KERNEL__ */
#endif #endif
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/dirent.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/nfs_fs.h> #include <linux/nfs_fs.h>
...@@ -324,22 +325,32 @@ static int __init mount_nfs_root(void) ...@@ -324,22 +325,32 @@ static int __init mount_nfs_root(void)
#endif #endif
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
/*
* If the dir will fit in *buf, return its length. If it won't fit, return
* zero. Return -ve on error.
*/
static int __init do_read_dir(int fd, void *buf, int len) static int __init do_read_dir(int fd, void *buf, int len)
{ {
long bytes, n; long bytes, n;
char *p = buf; char *p = buf;
lseek(fd, 0, 0); lseek(fd, 0, 0);
for (bytes = 0, p = buf; bytes < len; bytes += n, p+=n) { for (bytes = 0; bytes < len; bytes += n) {
n = sys_getdents64(fd, p, len - bytes); n = sys_getdents64(fd, p + bytes, len - bytes);
if (n < 0) if (n < 0)
return -1; return n;
if (n == 0) if (n == 0)
return bytes; return bytes;
} }
return 0; return 0;
} }
/*
* Try to read all of a directory. Returns the contents at *p, which
* is kmalloced memory. Returns the number of bytes read at *len. Returns
* NULL on error.
*/
static void * __init read_dir(char *path, int *len) static void * __init read_dir(char *path, int *len)
{ {
int size; int size;
...@@ -349,7 +360,7 @@ static void * __init read_dir(char *path, int *len) ...@@ -349,7 +360,7 @@ static void * __init read_dir(char *path, int *len)
if (fd < 0) if (fd < 0)
return NULL; return NULL;
for (size = 1<<9; size < (1<<18); size <<= 1) { for (size = 1 << 9; size <= (1 << MAX_ORDER); size <<= 1) {
void *p = kmalloc(size, GFP_KERNEL); void *p = kmalloc(size, GFP_KERNEL);
int n; int n;
if (!p) if (!p)
...@@ -361,6 +372,8 @@ static void * __init read_dir(char *path, int *len) ...@@ -361,6 +372,8 @@ static void * __init read_dir(char *path, int *len)
return p; return p;
} }
kfree(p); kfree(p);
if (n == -EINVAL)
continue; /* Try a larger buffer */
if (n < 0) if (n < 0)
break; break;
} }
...@@ -369,14 +382,6 @@ static void * __init read_dir(char *path, int *len) ...@@ -369,14 +382,6 @@ static void * __init read_dir(char *path, int *len)
} }
#endif #endif
struct linux_dirent64 {
u64 d_ino;
s64 d_off;
unsigned short d_reclen;
unsigned char d_type;
char d_name[0];
};
static int __init find_in_devfs(char *path, dev_t dev) static int __init find_in_devfs(char *path, dev_t dev)
{ {
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment