Merge tag 'jfs-6.12-rc5' of github.com:kleikamp/linux-shaggy

torvalds · torvalds · commit 6cc65abee8ee · 2024-10-24T12:47:01.000-07:00
Pull jfs fix from David Kleikamp:
 "Fix a regression introduced in 6.12-rc1"

* tag 'jfs-6.12-rc5' of github.com:kleikamp/linux-shaggy:
  jfs: Fix sanity check in dbMount
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
@@ -187,7 +187,7 @@ int dbMount(struct inode *ipbmap)
 	}
 
 	bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);
-	if (!bmp->db_numag || bmp->db_numag >= MAXAG) {
+	if (!bmp->db_numag || bmp->db_numag > MAXAG) {
 		err = -EINVAL;
 		goto err_release_metapage;
 	}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ int dbMount(struct inode *ipbmap)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);`
`190`		`- if (!bmp->db_numag \|\| bmp->db_numag >= MAXAG) {`
	`190`	`+ if (!bmp->db_numag \|\| bmp->db_numag > MAXAG) {`
`191`	`191`	`err = -EINVAL;`
`192`	`192`	`goto err_release_metapage;`
`193`	`193`	`}`