korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "jfs: fix shift-out-of-bounds in dbJoin"

Browse Source 
commit e42e29cc44 upstream.

This reverts commit cca974daeb.

The added sanity check is incorrect. BUDMIN is not the wrong value and
is too small.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Kleikamp 2024-01-29 08:40:23 -06:00 committed by Greg Kroah-Hartman
parent 49df34d2b7
commit 6fb93eeb25
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/jfs/jfs_dmap.c
View File

@ -2765,9 +2765,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl)
* leafno - the number of the leaf to be updated.
* newval - the new value for the leaf.
*
* RETURN VALUES:
* 0 - success
* -EIO - i/o error
* RETURN VALUES: none
*/
static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
{
@ -2794,10 +2792,6 @@ static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
* get the buddy size (number of words covered) of
* the new value.
*/
if ((newval - tp->dmt_budmin) > BUDMIN)
return -EIO;
budsz = BUDSIZE(newval, tp->dmt_budmin);
/* try to join.