2023-10-08 17:48:38

by Manas Ghandat

Subject: [PATCH] jfs : fix array-index-out-of-bounds in diWrite

Currently while copying dtree root from inode to dnode in the xp slot
there is a out of bound memcpy. Added a bound check to the memcpy.

Reported-by: [email protected]
Fixes: https://syzkaller.appspot.com/bug?extid=c1056fdfe414463fdb33
Signed-off-by: Manas Ghandat <[email protected]>
---
fs/jfs/jfs_imap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 799d3837e7c2..d1f897848be0 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -746,7 +746,8 @@ int diWrite(tid_t tid, struct inode *ip)
xp = (dtpage_t *) & dp->di_dtroot;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
- memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
+ if (lv->offset < 128)
+ memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
lv->length << L2DTSLOTSIZE);
}
} else {
--
2.37.2

2023-10-16 15:02:13

by Manas Ghandat

Subject: Re: [PATCH] jfs : fix array-index-out-of-bounds in diWrite

Just a friendly ping :)

On 08/10/23 23:17, Manas Ghandat wrote:
> Currently while copying dtree root from inode to dnode in the xp slot
> there is a out of bound memcpy. Added a bound check to the memcpy.
>
> Reported-by: [email protected]
> Fixes: https://syzkaller.appspot.com/bug?extid=c1056fdfe414463fdb33
> Signed-off-by: Manas Ghandat <[email protected]>
> ---
> fs/jfs/jfs_imap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
> index 799d3837e7c2..d1f897848be0 100644
> --- a/fs/jfs/jfs_imap.c
> +++ b/fs/jfs/jfs_imap.c
> @@ -746,7 +746,8 @@ int diWrite(tid_t tid, struct inode *ip)
> xp = (dtpage_t *) & dp->di_dtroot;
> lv = ilinelock->lv;
> for (n = 0; n < ilinelock->index; n++, lv++) {
> - memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
> + if (lv->offset < 128)
> + memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
> lv->length << L2DTSLOTSIZE);
> }
> } else {

2023-11-01 15:07:44

by Dave Kleikamp

Subject: Re: [PATCH] jfs : fix array-index-out-of-bounds in diWrite

On 10/8/23 12:47PM, Manas Ghandat wrote:
> Currently while copying dtree root from inode to dnode in the xp slot
> there is a out of bound memcpy. Added a bound check to the memcpy.
>
> Reported-by: [email protected]
> Fixes: https://syzkaller.appspot.com/bug?extid=c1056fdfe414463fdb33
> Signed-off-by: Manas Ghandat <[email protected]>
> ---
> fs/jfs/jfs_imap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
> index 799d3837e7c2..d1f897848be0 100644
> --- a/fs/jfs/jfs_imap.c
> +++ b/fs/jfs/jfs_imap.c
> @@ -746,7 +746,8 @@ int diWrite(tid_t tid, struct inode *ip)
> xp = (dtpage_t *) & dp->di_dtroot;
> lv = ilinelock->lv;
> for (n = 0; n < ilinelock->index; n++, lv++) {
> - memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
> + if (lv->offset < 128)

I'd use DTPAGEMAXSLOT instead of hard-coding 128.

Also, we could at least set rc to -EIO, or we could do something more.
Calling jfs_error() would mark the superblock dirty and usually makes
the file system read-only until it's fixed.

> + memcpy(&xp->slot[lv->offset], &p->slot[lv->offset],
> lv->length << L2DTSLOTSIZE);
> }
> } else {