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

Commit d8bc89a7 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: remove LL_IOC_REMOVE_ENTRY handler 



It uses getname in unsafe manner and since it's to deal with corrupted
or inconsistent filesystem, we are probably better to deal with
it from lfsck anyway.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78a66b00

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+0 −1
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ struct ost_id { 


#define LL_IOC_LMV_SETSTRIPE	    _IOWR('f', 240, struct lmv_user_md)

#define LL_IOC_LMV_GETSTRIPE	    _IOWR('f', 241, struct lmv_user_md)

#define LL_IOC_REMOVE_ENTRY	    _IOWR('f', 242, __u64)

#define LL_IOC_SET_LEASE		_IOWR('f', 243, long)

#define LL_IOC_GET_LEASE		_IO('f', 244)

#define LL_IOC_HSM_IMPORT		_IOWR('f', 245, struct hsm_user_import)

drivers/staging/lustre/lustre/llite/dir.c

+0 −29
Original line number Diff line number Diff line
@@ -1436,35 +1436,6 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		kfree(tmp);

		return rc;

	}

	case LL_IOC_REMOVE_ENTRY: {

		char		*filename = NULL;

		int		 namelen = 0;

		int		 rc;



		/* Here is a little hack to avoid sending REINT_RMENTRY to

		 * unsupported server, which might crash the server(LU-2730),

		 * Because both LVB_TYPE and REINT_RMENTRY will be supported

		 * on 2.4, we use OBD_CONNECT_LVB_TYPE to detect whether the

		 * server will support REINT_RMENTRY XXX*/

		if (!(exp_connect_flags(sbi->ll_md_exp) & OBD_CONNECT_LVB_TYPE))

			return -ENOTSUPP;



		filename = ll_getname((const char *)arg);

		if (IS_ERR(filename))

			return PTR_ERR(filename);



		namelen = strlen(filename);

		if (namelen < 1) {

			rc = -EINVAL;

			goto out_rmdir;

		}



		rc = ll_rmdir_entry(inode, filename, namelen);

out_rmdir:

		if (filename)

			ll_putname(filename);

		return rc;

	}

	case LL_IOC_LOV_SWAP_LAYOUTS:

		return -EPERM;

	case LL_IOC_OBD_STATFS: