* [PATCH] erofs: fix general protection fault when reading fragment
@ 2022-10-21 8:31 ` Yue Hu
0 siblings, 0 replies; 4+ messages in thread
From: Yue Hu @ 2022-10-21 8:31 UTC (permalink / raw)
To: xiang, chao
Cc: syzbot+3faecbfd845a895c04cb, syzkaller-bugs, linux-kernel,
zhangwen, Yue Hu, linux-erofs
From: Yue Hu <huyue2@coolpad.com>
As syzbot reported [1], the fragment feature sb flag is not set, so
packed_inode != NULL needs to be checked in z_erofs_read_fragment().
[1] https://lore.kernel.org/all/0000000000002e7a8905eb841ddd@google.com/
Reported-by: syzbot+3faecbfd845a895c04cb@syzkaller.appspotmail.com
Fixes: 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")
Signed-off-by: Yue Hu <huyue2@coolpad.com>
---
fs/erofs/zdata.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index cce56dde135c..310f6916787a 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
u8 *src, *dst;
unsigned int i, cnt;
+ if (!packed_inode)
+ return -EFAULT;
+
pos += EROFS_I(inode)->z_fragmentoff;
for (i = 0; i < len; i += cnt) {
cnt = min_t(unsigned int, len - i,
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] erofs: fix general protection fault when reading fragment
@ 2022-10-21 8:31 ` Yue Hu
0 siblings, 0 replies; 4+ messages in thread
From: Yue Hu @ 2022-10-21 8:31 UTC (permalink / raw)
To: xiang, chao
Cc: linux-erofs, linux-kernel, syzbot+3faecbfd845a895c04cb,
syzkaller-bugs, zhangwen, Yue Hu
From: Yue Hu <huyue2@coolpad.com>
As syzbot reported [1], the fragment feature sb flag is not set, so
packed_inode != NULL needs to be checked in z_erofs_read_fragment().
[1] https://lore.kernel.org/all/0000000000002e7a8905eb841ddd@google.com/
Reported-by: syzbot+3faecbfd845a895c04cb@syzkaller.appspotmail.com
Fixes: 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")
Signed-off-by: Yue Hu <huyue2@coolpad.com>
---
fs/erofs/zdata.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index cce56dde135c..310f6916787a 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
u8 *src, *dst;
unsigned int i, cnt;
+ if (!packed_inode)
+ return -EFAULT;
+
pos += EROFS_I(inode)->z_fragmentoff;
for (i = 0; i < len; i += cnt) {
cnt = min_t(unsigned int, len - i,
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] erofs: fix general protection fault when reading fragment
2022-10-21 8:31 ` Yue Hu
@ 2022-10-21 8:47 ` Gao Xiang
-1 siblings, 0 replies; 4+ messages in thread
From: Gao Xiang @ 2022-10-21 8:47 UTC (permalink / raw)
To: Yue Hu
Cc: xiang, chao, linux-erofs, linux-kernel,
syzbot+3faecbfd845a895c04cb, syzkaller-bugs, zhangwen, Yue Hu
On Fri, Oct 21, 2022 at 04:31:16PM +0800, Yue Hu wrote:
> From: Yue Hu <huyue2@coolpad.com>
>
> As syzbot reported [1], the fragment feature sb flag is not set, so
> packed_inode != NULL needs to be checked in z_erofs_read_fragment().
>
> [1] https://lore.kernel.org/all/0000000000002e7a8905eb841ddd@google.com/
>
> Reported-by: syzbot+3faecbfd845a895c04cb@syzkaller.appspotmail.com
> Fixes: 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")
> Signed-off-by: Yue Hu <huyue2@coolpad.com>
> ---
> fs/erofs/zdata.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
> index cce56dde135c..310f6916787a 100644
> --- a/fs/erofs/zdata.c
> +++ b/fs/erofs/zdata.c
> @@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
> u8 *src, *dst;
> unsigned int i, cnt;
>
> + if (!packed_inode)
> + return -EFAULT;
You should use -EFSCURRUPTED; here.
Thanks,
Gao Xiang
> +
> pos += EROFS_I(inode)->z_fragmentoff;
> for (i = 0; i < len; i += cnt) {
> cnt = min_t(unsigned int, len - i,
> --
> 2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] erofs: fix general protection fault when reading fragment
@ 2022-10-21 8:47 ` Gao Xiang
0 siblings, 0 replies; 4+ messages in thread
From: Gao Xiang @ 2022-10-21 8:47 UTC (permalink / raw)
To: Yue Hu
Cc: syzbot+3faecbfd845a895c04cb, syzkaller-bugs, linux-kernel,
zhangwen, Yue Hu, linux-erofs
On Fri, Oct 21, 2022 at 04:31:16PM +0800, Yue Hu wrote:
> From: Yue Hu <huyue2@coolpad.com>
>
> As syzbot reported [1], the fragment feature sb flag is not set, so
> packed_inode != NULL needs to be checked in z_erofs_read_fragment().
>
> [1] https://lore.kernel.org/all/0000000000002e7a8905eb841ddd@google.com/
>
> Reported-by: syzbot+3faecbfd845a895c04cb@syzkaller.appspotmail.com
> Fixes: 08a0c9ef3e7e ("erofs: support on-disk compressed fragments data")
> Signed-off-by: Yue Hu <huyue2@coolpad.com>
> ---
> fs/erofs/zdata.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
> index cce56dde135c..310f6916787a 100644
> --- a/fs/erofs/zdata.c
> +++ b/fs/erofs/zdata.c
> @@ -659,6 +659,9 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
> u8 *src, *dst;
> unsigned int i, cnt;
>
> + if (!packed_inode)
> + return -EFAULT;
You should use -EFSCURRUPTED; here.
Thanks,
Gao Xiang
> +
> pos += EROFS_I(inode)->z_fragmentoff;
> for (i = 0; i < len; i += cnt) {
> cnt = min_t(unsigned int, len - i,
> --
> 2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-21 8:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-21 8:31 [PATCH] erofs: fix general protection fault when reading fragment Yue Hu
2022-10-21 8:31 ` Yue Hu
2022-10-21 8:47 ` Gao Xiang
2022-10-21 8:47 ` Gao Xiang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.