diff mbox series

[4.19.y] erofs: add unsupported inode i_format check

Message ID 20210507151545.235017-1-hsiangkao@redhat.com
State New
Headers show
Series [4.19.y] erofs: add unsupported inode i_format check | expand

Commit Message

Gao Xiang May 7, 2021, 3:15 p.m. UTC 
From: Gao Xiang <xiang@kernel.org>

commit 24a806d849c0b0c1d0cd6a6b93ba4ae4c0ec9f08 upstream.

If any unknown i_format fields are set (may be of some new incompat
inode features), mark such inode as unsupported.

Just in case of any new incompat i_format fields added in the future.

Fixes: 431339ba9042 ("staging: erofs: add inode operations")
Cc: <stable@vger.kernel.org> # 4.19+
[ Gao Xiang: Manually backport to 4.19.y due to trivial conflicts. ]
Signed-off-by: Gao Xiang <xiang@kernel.org>
---
Hi Greg,

Please consider this backport patch for 4.19 staging erofs.
(btw, I use xiang@kernel.org instead of @redhat.com here since
 I'll shift to Alibaba in weeks...)

Thanks,
Gao Xiang

 drivers/staging/erofs/erofs_fs.h | 3 +++
 drivers/staging/erofs/inode.c    | 6 ++++++
 2 files changed, 9 insertions(+)

Comments

Greg KH May 7, 2021, 3:22 p.m. UTC | #1 
On Fri, May 07, 2021 at 11:15:45PM +0800, Gao Xiang wrote:
> From: Gao Xiang <xiang@kernel.org>
> 
> commit 24a806d849c0b0c1d0cd6a6b93ba4ae4c0ec9f08 upstream.
> 
> If any unknown i_format fields are set (may be of some new incompat
> inode features), mark such inode as unsupported.
> 
> Just in case of any new incompat i_format fields added in the future.
> 
> Fixes: 431339ba9042 ("staging: erofs: add inode operations")
> Cc: <stable@vger.kernel.org> # 4.19+
> [ Gao Xiang: Manually backport to 4.19.y due to trivial conflicts. ]
> Signed-off-by: Gao Xiang <xiang@kernel.org>
> ---
> Hi Greg,
> 
> Please consider this backport patch for 4.19 staging erofs.
> (btw, I use xiang@kernel.org instead of @redhat.com here since
>  I'll shift to Alibaba in weeks...)


Thanks for this, now queued up!

greg k-h
diff mbox series

Patch

diff --git a/drivers/staging/erofs/erofs_fs.h b/drivers/staging/erofs/erofs_fs.h
index 7677da889f12..38f15e3d8ebb 100644
--- a/drivers/staging/erofs/erofs_fs.h
+++ b/drivers/staging/erofs/erofs_fs.h
@@ -71,6 +71,9 @@  enum {
 #define EROFS_I_VERSION_BIT             0
 __EROFS_BIT(EROFS_I_, DATA_MAPPING, VERSION);
 
+#define EROFS_I_ALL	\
+	((1 << (EROFS_I_DATA_MAPPING_BIT + EROFS_I_DATA_MAPPING_BITS)) - 1)
+
 struct erofs_inode_v1 {
 /*  0 */__le16 i_advise;
 
diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c
index a43abd530cc1..02398c7eb4a4 100644
--- a/drivers/staging/erofs/inode.c
+++ b/drivers/staging/erofs/inode.c
@@ -48,6 +48,12 @@  static struct page *read_inode(struct inode *inode, unsigned int *ofs)
 	v1 = page_address(page) + *ofs;
 	ifmt = le16_to_cpu(v1->i_advise);
 
+	if (ifmt & ~EROFS_I_ALL) {
+		errln("unsupported i_format %u of nid %llu", ifmt, vi->nid);
+		err = -EOPNOTSUPP;
+		goto err_out;
+	}
+
 	vi->data_mapping_mode = __inode_data_mapping(ifmt);
 	if (unlikely(vi->data_mapping_mode >= EROFS_INODE_LAYOUT_MAX)) {
 		errln("unknown data mapping mode %u of nid %llu",