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

Commit 7e7742ee authored by Al Viro's avatar Al Viro
Browse files

sanitize signedness/const for pointers to char in hpfs a bit 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1f707137

fs/hpfs/anode.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ int hpfs_ea_read(struct super_block *s, secno a, int ano, unsigned pos, 
}



int hpfs_ea_write(struct super_block *s, secno a, int ano, unsigned pos,

	     unsigned len, char *buf)

	     unsigned len, const char *buf)

{

	struct buffer_head *bh;

	char *data;

fs/hpfs/dentry.c

+8 −6
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ static int hpfs_hash_dentry(struct dentry *dentry, struct qstr *qstr) 


	if (l == 1) if (qstr->name[0]=='.') goto x;

	if (l == 2) if (qstr->name[0]=='.' || qstr->name[1]=='.') goto x;

	hpfs_adjust_length((char *)qstr->name, &l);

	/*if (hpfs_chk_name((char *)qstr->name,&l))*/

	hpfs_adjust_length(qstr->name, &l);

	/*if (hpfs_chk_name(qstr->name,&l))*/

		/*return -ENAMETOOLONG;*/

		/*return -ENOENT;*/

	x:
@@ -38,14 +38,16 @@ static int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qst 
{

	unsigned al=a->len;

	unsigned bl=b->len;

	hpfs_adjust_length((char *)a->name, &al);

	/*hpfs_adjust_length((char *)b->name, &bl);*/

	hpfs_adjust_length(a->name, &al);

	/*hpfs_adjust_length(b->name, &bl);*/

	/* 'a' is the qstr of an already existing dentry, so the name

	 * must be valid. 'b' must be validated first.

	 */



	if (hpfs_chk_name((char *)b->name, &bl)) return 1;

	if (hpfs_compare_names(dentry->d_sb, (char *)a->name, al, (char *)b->name, bl, 0)) return 1;

	if (hpfs_chk_name(b->name, &bl))

		return 1;

	if (hpfs_compare_names(dentry->d_sb, a->name, al, b->name, bl, 0))

		return 1;

	return 0;

}

fs/hpfs/dir.c

+7 −7
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	struct hpfs_dirent *de;

	int lc;

	long old_pos;

	char *tempname;

	unsigned char *tempname;

	int c1, c2 = 0;

	int ret = 0;
@@ -158,11 +158,11 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
		tempname = hpfs_translate_name(inode->i_sb, de->name, de->namelen, lc, de->not_8x3);

		if (filldir(dirent, tempname, de->namelen, old_pos, de->fnode, DT_UNKNOWN) < 0) {

			filp->f_pos = old_pos;

			if (tempname != (char *)de->name) kfree(tempname);

			if (tempname != de->name) kfree(tempname);

			hpfs_brelse4(&qbh);

			goto out;

		}

		if (tempname != (char *)de->name) kfree(tempname);

		if (tempname != de->name) kfree(tempname);

		hpfs_brelse4(&qbh);

	}

out:
@@ -187,7 +187,7 @@ out: 


struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)

{

	const char *name = dentry->d_name.name;

	const unsigned char *name = dentry->d_name.name;

	unsigned len = dentry->d_name.len;

	struct quad_buffer_head qbh;

	struct hpfs_dirent *de;
@@ -197,7 +197,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name 
	struct hpfs_inode_info *hpfs_result;



	lock_kernel();

	if ((err = hpfs_chk_name((char *)name, &len))) {

	if ((err = hpfs_chk_name(name, &len))) {

		if (err == -ENAMETOOLONG) {

			unlock_kernel();

			return ERR_PTR(-ENAMETOOLONG);
@@ -209,7 +209,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name 
	 * '.' and '..' will never be passed here.

	 */



	de = map_dirent(dir, hpfs_i(dir)->i_dno, (char *) name, len, NULL, &qbh);

	de = map_dirent(dir, hpfs_i(dir)->i_dno, name, len, NULL, &qbh);



	/*

	 * This is not really a bailout, just means file not found.
@@ -250,7 +250,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name 
	hpfs_result = hpfs_i(result);

	if (!de->directory) hpfs_result->i_parent_dir = dir->i_ino;



	hpfs_decide_conv(result, (char *)name, len);

	hpfs_decide_conv(result, name, len);



	if (de->has_acl || de->has_xtd_perm) if (!(dir->i_sb->s_flags & MS_RDONLY)) {

		hpfs_error(result->i_sb, "ACLs or XPERM found. This is probably HPFS386. This driver doesn't support it now. Send me some info on these structures");

fs/hpfs/dnode.c

+13 −8
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ static void set_last_pointer(struct super_block *s, struct dnode *d, dnode_secno 


/* Add an entry to dnode and don't care if it grows over 2048 bytes */



struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d, unsigned char *name,

struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d,

				const unsigned char *name,

				unsigned namelen, secno down_ptr)

{

	struct hpfs_dirent *de;
@@ -223,7 +224,7 @@ static void fix_up_ptrs(struct super_block *s, struct dnode *d) 
/* Add an entry to dnode and do dnode splitting if required */



static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,

			     unsigned char *name, unsigned namelen,

			     const unsigned char *name, unsigned namelen,

			     struct hpfs_dirent *new_de, dnode_secno down_ptr)

{

	struct quad_buffer_head qbh, qbh1, qbh2;
@@ -231,7 +232,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, 
	dnode_secno adno, rdno;

	struct hpfs_dirent *de;

	struct hpfs_dirent nde;

	char *nname;

	unsigned char *nname;

	int h;

	int pos;

	struct buffer_head *bh;
@@ -305,7 +306,9 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, 
		pos++;

	}

	copy_de(new_de = &nde, de);

	memcpy(name = nname, de->name, namelen = de->namelen);

	memcpy(nname, de->name, de->namelen);

	name = nname;

	namelen = de->namelen;

	for_all_poss(i, hpfs_pos_subst, ((loff_t)dno << 4) | pos, 4);

	down_ptr = adno;

	set_last_pointer(i->i_sb, ad, de->down ? de_down_pointer(de) : 0);
@@ -368,7 +371,8 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, 
 * I hope, now it's finally bug-free.

 */



int hpfs_add_dirent(struct inode *i, unsigned char *name, unsigned namelen,

int hpfs_add_dirent(struct inode *i,

		    const unsigned char *name, unsigned namelen,

		    struct hpfs_dirent *new_de, int cdepth)

{

	struct hpfs_inode_info *hpfs_inode = hpfs_i(i);
@@ -897,7 +901,8 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp, 


/* Find a dirent in tree */



struct hpfs_dirent *map_dirent(struct inode *inode, dnode_secno dno, char *name, unsigned len,

struct hpfs_dirent *map_dirent(struct inode *inode, dnode_secno dno,

			       const unsigned char *name, unsigned len,

			       dnode_secno *dd, struct quad_buffer_head *qbh)

{

	struct dnode *dnode;
@@ -988,8 +993,8 @@ void hpfs_remove_dtree(struct super_block *s, dnode_secno dno) 
struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,

				     struct fnode *f, struct quad_buffer_head *qbh)

{

	char *name1;

	char *name2;

	unsigned char *name1;

	unsigned char *name2;

	int name1len, name2len;

	struct dnode *d;

	dnode_secno dno, downd;

fs/hpfs/ea.c

+4 −3
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ static char *get_indirect_ea(struct super_block *s, int ano, secno a, int size) 
	return ret;

}



static void set_indirect_ea(struct super_block *s, int ano, secno a, char *data,

			    int size)

static void set_indirect_ea(struct super_block *s, int ano, secno a,

			    const char *data, int size)

{

	hpfs_ea_write(s, a, ano, 0, size, data);

}
@@ -186,7 +186,8 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si 
 * This driver can't change sizes of eas ('cause I just don't need it).

 */



void hpfs_set_ea(struct inode *inode, struct fnode *fnode, char *key, char *data, int size)

void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,

		 const char *data, int size)

{

	fnode_secno fno = inode->i_ino;

	struct super_block *s = inode->i_sb;