Commit cc314eef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix nasty ncpfs symlink handling bug. 



This bug could cause oopses and page state corruption, because ncpfs
used the generic page-cache symlink handlign functions.  But those
functions only work if the page cache is guaranteed to be "stable", ie a
page that was installed when the symlink walk was started has to still
be installed in the page cache at the end of the walk.

We could have fixed ncpfs to not use the generic helper routines, but it
is in many ways much cleaner to instead improve on the symlink walking
helper routines so that they don't require that absolute stability.

We do this by allowing "follow_link()" to return a error-pointer as a
cookie, which is fed back to the cleanup "put_link()" routine.  This
also simplifies NFS symlink handling.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2fb1e308

fs/autofs/symlink.c

+3 −2
Original line number Diff line number Diff line
@@ -12,11 +12,12 @@ 


#include "autofs_i.h"



static int autofs_follow_link(struct dentry *dentry, struct nameidata *nd)

/* Nothing to release.. */

static void *autofs_follow_link(struct dentry *dentry, struct nameidata *nd)

{

	char *s=((struct autofs_symlink *)dentry->d_inode->u.generic_ip)->data;

	nd_set_link(nd, s);

	return 0;

	return NULL;

}



struct inode_operations autofs_symlink_inode_operations = {

fs/cifs/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ extern int cifs_dir_notify(struct file *, unsigned long arg); 
extern struct dentry_operations cifs_dentry_ops;



/* Functions related to symlinks */

extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd);

extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd);

extern void *cifs_follow_link(struct dentry *direntry, struct nameidata *nd);

extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *);

extern int cifs_readlink(struct dentry *direntry, char __user *buffer, 

			 int buflen);

extern int cifs_symlink(struct inode *inode, struct dentry *direntry,

fs/cifs/link.c

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ cifs_hl_exit: 
	return rc;

}



int

void *

cifs_follow_link(struct dentry *direntry, struct nameidata *nd)

{

	struct inode *inode = direntry->d_inode;
@@ -148,7 +148,7 @@ out: 
out_no_free:

	FreeXid(xid);

	nd_set_link(nd, target_path);

	return 0;

	return NULL;	/* No cookie */

}



int
@@ -330,7 +330,7 @@ cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen) 
	return rc;

}



void cifs_put_link(struct dentry *direntry, struct nameidata *nd)

void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)

{

	char *p = nd_get_link(nd);

	if (!IS_ERR(p))

fs/ext2/symlink.c

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include "xattr.h"

#include <linux/namei.h>



static int ext2_follow_link(struct dentry *dentry, struct nameidata *nd)

static void *ext2_follow_link(struct dentry *dentry, struct nameidata *nd)

{

	struct ext2_inode_info *ei = EXT2_I(dentry->d_inode);

	nd_set_link(nd, (char *)ei->i_data);

	return 0;

	return NULL;

}



struct inode_operations ext2_symlink_inode_operations = {

fs/ext3/symlink.c

+2 −2
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
#include <linux/namei.h>

#include "xattr.h"



static int ext3_follow_link(struct dentry *dentry, struct nameidata *nd)

static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd)

{

	struct ext3_inode_info *ei = EXT3_I(dentry->d_inode);

	nd_set_link(nd, (char*)ei->i_data);

	return 0;

	return NULL;

}



struct inode_operations ext3_symlink_inode_operations = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE