Commit e9806ff8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-6.7' of https://github.com/kleikamp/linux-shaggy 

Pull jfs updates from Dave Kleikamp:
 "Minor stability improvements"

* tag 'jfs-6.7' of https://github.com/kleikamp/linux-shaggy:
  jfs: define xtree root and page independently
  jfs: fix array-index-out-of-bounds in diAlloc
  jfs: fix array-index-out-of-bounds in dbFindLeaf
  fs/jfs: Add validity check for db_maxag and db_agpref
  fs/jfs: Add check for negative db_l2nbperpage
parents dc737f11 a779ed75

fs/jfs/jfs_dinode.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct dinode { 
#define di_gengen	u._file._u1._imap._gengen



			union {

				xtpage_t _xtroot;

				xtroot_t _xtroot;

				struct {

					u8 unused[16];	/* 16: */

					dxd_t _dxd;	/* 16: */

fs/jfs/jfs_dmap.c

+18 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, 
static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks);

static int dbFindBits(u32 word, int l2nb);

static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno);

static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx);

static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl);

static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno,

		      int nblocks);

static int dbFreeDmap(struct bmap * bmp, struct dmap * dp, s64 blkno,
@@ -180,7 +180,8 @@ int dbMount(struct inode *ipbmap) 
	bmp->db_nfree = le64_to_cpu(dbmp_le->dn_nfree);



	bmp->db_l2nbperpage = le32_to_cpu(dbmp_le->dn_l2nbperpage);

	if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE) {

	if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE ||

		bmp->db_l2nbperpage < 0) {

		err = -EINVAL;

		goto err_release_metapage;

	}
@@ -194,6 +195,12 @@ int dbMount(struct inode *ipbmap) 
	bmp->db_maxlevel = le32_to_cpu(dbmp_le->dn_maxlevel);

	bmp->db_maxag = le32_to_cpu(dbmp_le->dn_maxag);

	bmp->db_agpref = le32_to_cpu(dbmp_le->dn_agpref);

	if (bmp->db_maxag >= MAXAG || bmp->db_maxag < 0 ||

		bmp->db_agpref >= MAXAG || bmp->db_agpref < 0) {

		err = -EINVAL;

		goto err_release_metapage;

	}



	bmp->db_aglevel = le32_to_cpu(dbmp_le->dn_aglevel);

	bmp->db_agheight = le32_to_cpu(dbmp_le->dn_agheight);

	bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth);
@@ -1710,7 +1717,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno) 
		 * dbFindLeaf() returns the index of the leaf at which

		 * free space was found.

		 */

		rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx);

		rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx, true);



		/* release the buffer.

		 */
@@ -1957,7 +1964,7 @@ dbAllocDmapLev(struct bmap * bmp, 
	 * free space.  if sufficient free space is found, dbFindLeaf()

	 * returns the index of the leaf at which free space was found.

	 */

	if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx))

	if (dbFindLeaf((dmtree_t *) &dp->tree, l2nb, &leafidx, false))

		return -ENOSPC;



	if (leafidx < 0)
@@ -2921,14 +2928,18 @@ static void dbAdjTree(dmtree_t * tp, int leafno, int newval) 
 *	leafidx	- return pointer to be set to the index of the leaf

 *		  describing at least l2nb free blocks if sufficient

 *		  free blocks are found.

 *	is_ctl	- determines if the tree is of type ctl

 *

 * RETURN VALUES:

 *	0	- success

 *	-ENOSPC	- insufficient free blocks.

 */

static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx)

static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)

{

	int ti, n = 0, k, x = 0;

	int max_size;



	max_size = is_ctl ? CTLTREESIZE : TREESIZE;



	/* first check the root of the tree to see if there is

	 * sufficient free space.
@@ -2949,6 +2960,8 @@ static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx) 
			/* sufficient free space found.  move to the next

			 * level (or quit if this is the last level).

			 */

			if (x + n > max_size)

				return -ENOSPC;

			if (l2nb <= tp->dmt_stree[x + n])

				break;

		}

fs/jfs/jfs_imap.c

+7 −4
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ int diWrite(tid_t tid, struct inode *ip) 
		 * This is the special xtree inside the directory for storing

		 * the directory table

		 */

		xtpage_t *p, *xp;

		xtroot_t *p, *xp;

		xad_t *xad;



		jfs_ip->xtlid = 0;
@@ -684,7 +684,7 @@ int diWrite(tid_t tid, struct inode *ip) 
		 * copy xtree root from inode to dinode:

		 */

		p = &jfs_ip->i_xtroot;

		xp = (xtpage_t *) &dp->di_dirtable;

		xp = (xtroot_t *) &dp->di_dirtable;

		lv = ilinelock->lv;

		for (n = 0; n < ilinelock->index; n++, lv++) {

			memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -713,7 +713,7 @@ int diWrite(tid_t tid, struct inode *ip) 
	 *	regular file: 16 byte (XAD slot) granularity

	 */

	if (type & tlckXTREE) {

		xtpage_t *p, *xp;

		xtroot_t *p, *xp;

		xad_t *xad;



		/*
@@ -1320,7 +1320,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) 
int diAlloc(struct inode *pip, bool dir, struct inode *ip)

{

	int rc, ino, iagno, addext, extno, bitno, sword;

	int nwords, rem, i, agno;

	int nwords, rem, i, agno, dn_numag;

	u32 mask, inosmap, extsmap;

	struct inode *ipimap;

	struct metapage *mp;
@@ -1356,6 +1356,9 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) 


	/* get the ag number of this iag */

	agno = BLKTOAG(JFS_IP(pip)->agstart, JFS_SBI(pip->i_sb));

	dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag;

	if (agno < 0 || agno > dn_numag)

		return -EIO;



	if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) {

		/*

fs/jfs/jfs_incore.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct jfs_inode_info { 
	lid_t	xtlid;		/* lid of xtree lock on directory */

	union {

		struct {

			xtpage_t _xtroot;	/* 288: xtree root */

			xtroot_t _xtroot;	/* 288: xtree root */

			struct inomap *_imap;	/* 4: inode map header	*/

		} file;

		struct {

fs/jfs/jfs_txnmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, 
			if (mp->xflag & COMMIT_PAGE)

				p = (xtpage_t *) mp->data;

			else

				p = &jfs_ip->i_xtroot;

				p = (xtpage_t *) &jfs_ip->i_xtroot;

			xtlck->lwm.offset =

			    le16_to_cpu(p->header.nextindex);

		}
@@ -1676,7 +1676,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, 


	if (tlck->type & tlckBTROOT) {

		lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);

		p = &JFS_IP(ip)->i_xtroot;

		p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;

		if (S_ISDIR(ip->i_mode))

			lrd->log.redopage.type |=

			    cpu_to_le16(LOG_DIR_XTREE);