Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0ad13ef authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: Fix type mismatch with filldir_t used by nfsd 



nfsd defines a type 'encode_dent_fn' which is much like 'filldir_t' except
that the first pointer is 'struct readdir_cd *' rather than 'void *'.  It
then casts encode_dent_fn points to 'filldir_t' as needed.  This hides any
other type mismatches between the two such as the fact that the 'ino' arg
recently changed from ino_t to u64.

So: get rid of 'encode_dent_fn', get rid of the cast of the function type,
change the first arg of various functions from 'struct readdir_cd *' to
'void *', and live with the fact that we have a little less type checking
on the calling of these functions now.  Less internal (to nfsd) checking
offset by more external checking, which is more important.

Thanks to Gabriel Paubert <paubert@iram.es> for discovering this and
providing an initial patch.

Signed-off-by: default avatarGabriel Paubert <paubert@iram.es>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 45f8bde0

fs/nfsd/nfs3xdr.c

+5 −4
Original line number Diff line number Diff line
@@ -990,15 +990,16 @@ encode_entry(struct readdir_cd *ccd, const char *name, 
}



int

nfs3svc_encode_entry(struct readdir_cd *cd, const char *name,

		     int namlen, loff_t offset, ino_t ino, unsigned int d_type)

nfs3svc_encode_entry(void *cd, const char *name,

		     int namlen, loff_t offset, u64 ino, unsigned int d_type)

{

	return encode_entry(cd, name, namlen, offset, ino, d_type, 0);

}



int

nfs3svc_encode_entry_plus(struct readdir_cd *cd, const char *name,

			  int namlen, loff_t offset, ino_t ino, unsigned int d_type)

nfs3svc_encode_entry_plus(void *cd, const char *name,

			  int namlen, loff_t offset, u64 ino,

			  unsigned int d_type)

{

	return encode_entry(cd, name, namlen, offset, ino, d_type, 1);

}

fs/nfsd/nfs4xdr.c

+3 −2
Original line number Diff line number Diff line
@@ -1880,9 +1880,10 @@ nfsd4_encode_rdattr_error(__be32 *p, int buflen, __be32 nfserr) 
}



static int

nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen,

		    loff_t offset, ino_t ino, unsigned int d_type)

nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,

		    loff_t offset, u64 ino, unsigned int d_type)

{

	struct readdir_cd *ccd = ccdv;

	struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);

	int buflen;

	__be32 *p = cd->buffer;

fs/nfsd/nfsxdr.c

+3 −2
Original line number Diff line number Diff line
@@ -462,9 +462,10 @@ nfssvc_encode_statfsres(struct svc_rqst *rqstp, __be32 *p, 
}



int

nfssvc_encode_entry(struct readdir_cd *ccd, const char *name,

		    int namlen, loff_t offset, ino_t ino, unsigned int d_type)

nfssvc_encode_entry(void *ccdv, const char *name,

		    int namlen, loff_t offset, u64 ino, unsigned int d_type)

{

	struct readdir_cd *ccd = ccdv;

	struct nfsd_readdirres *cd = container_of(ccd, struct nfsd_readdirres, common);

	__be32	*p = cd->buffer;

	int	buflen, slen;

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1716,7 +1716,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, 
 */

__be32

nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, 

	     struct readdir_cd *cdp, encode_dent_fn func)

	     struct readdir_cd *cdp, filldir_t func)

{

	__be32		err;

	int 		host_err;
@@ -1741,7 +1741,7 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, 


	do {

		cdp->err = nfserr_eof; /* will be cleared on successful read */

		host_err = vfs_readdir(file, (filldir_t) func, cdp);

		host_err = vfs_readdir(file, func, cdp);

	} while (host_err >=0 && cdp->err == nfs_ok);

	if (host_err)

		err = nfserrno(host_err);

include/linux/nfsd/nfsd.h

+1 −3
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
struct readdir_cd {

	__be32			err;	/* 0, nfserr, or nfserr_eof */

};

typedef int		(*encode_dent_fn)(struct readdir_cd *, const char *,

						int, loff_t, ino_t, unsigned int);

typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);



extern struct svc_program	nfsd_program;
@@ -117,7 +115,7 @@ __be32 nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type, 
int		nfsd_truncate(struct svc_rqst *, struct svc_fh *,

				unsigned long size);

__be32		nfsd_readdir(struct svc_rqst *, struct svc_fh *,

			     loff_t *, struct readdir_cd *, encode_dent_fn);

			     loff_t *, struct readdir_cd *, filldir_t);

__be32		nfsd_statfs(struct svc_rqst *, struct svc_fh *,

				struct kstatfs *);