Commit b531b55a authored by Artem Bityutskiy's avatar Artem Bityutskiy

UBI: add more checks to chdev open

When opening UBI volumes by their character device names, make
sure we are opening character devices, not block devices or any
other inode type.
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent ff998793
...@@ -291,8 +291,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm); ...@@ -291,8 +291,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm);
*/ */
struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode) struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
{ {
int error, ubi_num, vol_id; int error, ubi_num, vol_id, mod;
struct ubi_volume_desc *ret;
struct inode *inode; struct inode *inode;
struct path path; struct path path;
...@@ -306,16 +305,16 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode) ...@@ -306,16 +305,16 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
return ERR_PTR(error); return ERR_PTR(error);
inode = path.dentry->d_inode; inode = path.dentry->d_inode;
mod = inode->i_mode;
ubi_num = ubi_major2num(imajor(inode)); ubi_num = ubi_major2num(imajor(inode));
vol_id = iminor(inode) - 1; vol_id = iminor(inode) - 1;
path_put(&path);
if (!S_ISCHR(mod))
return ERR_PTR(-EINVAL);
if (vol_id >= 0 && ubi_num >= 0) if (vol_id >= 0 && ubi_num >= 0)
ret = ubi_open_volume(ubi_num, vol_id, mode); return ubi_open_volume(ubi_num, vol_id, mode);
else return ERR_PTR(-ENODEV);
ret = ERR_PTR(-ENODEV);
path_put(&path);
return ret;
} }
EXPORT_SYMBOL_GPL(ubi_open_volume_path); EXPORT_SYMBOL_GPL(ubi_open_volume_path);
......
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