staging: erofs: {dir,inode,super}.c: rectify BUG_ONs (8b987bca) · Commits · 戴 / test

drivers/staging/erofs/dir.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -53,8 +53,11 @@ static int erofs_fill_dentries(struct dir_context *ctx,
		strnlen(de_name, maxsize - nameoff) :
		le16_to_cpu(de[1].nameoff) - nameoff;

		/* the corrupted directory found */
		BUG_ON(de_namelen < 0);
		/* a corrupted entry is found */
		if (unlikely(de_namelen < 0)) {
		DBG_BUGON(1);
		return -EIO;
		}

		#ifdef CONFIG_EROFS_FS_DEBUG
		dbg_namelen = min(EROFS_NAME_LEN - 1, de_namelen);

+8 −2

Original line number	Diff line number	Diff line
		@@ -133,7 +133,13 @@ static int fill_inline_data(struct inode inode, void data,
		return -ENOMEM;

		m_pofs += vi->inode_isize + vi->xattr_isize;
		BUG_ON(m_pofs + inode->i_size > PAGE_SIZE);

		/* inline symlink data shouldn't across page boundary as well */
		if (unlikely(m_pofs + inode->i_size > PAGE_SIZE)) {
		DBG_BUGON(1);
		kfree(lnk);
		return -EIO;
		}

		/* get in-page inline data */
		memcpy(lnk, data + m_pofs, inode->i_size);
		@@ -171,7 +177,7 @@ static int fill_inode(struct inode *inode, int isdir)
		return PTR_ERR(page);
		}

		BUG_ON(!PageUptodate(page));
		DBG_BUGON(!PageUptodate(page));
		data = page_address(page);

		err = read_inode(inode, data + ofs);

+6 −7

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ static int __init erofs_init_inode_cache(void)

		static void erofs_exit_inode_cache(void)
		{
		BUG_ON(erofs_inode_cachep == NULL);
		kmem_cache_destroy(erofs_inode_cachep);
		}

		@@ -303,8 +302,8 @@ static int managed_cache_releasepage(struct page *page, gfp_t gfp_mask)
		int ret = 1; /* 0 - busy */
		struct address_space *const mapping = page->mapping;

		BUG_ON(!PageLocked(page));
		BUG_ON(mapping->a_ops != &managed_cache_aops);
		DBG_BUGON(!PageLocked(page));
		DBG_BUGON(mapping->a_ops != &managed_cache_aops);

		if (PagePrivate(page))
		ret = erofs_try_to_free_cached_page(mapping, page);
		@@ -317,10 +316,10 @@ static void managed_cache_invalidatepage(struct page *page,
		{
		const unsigned int stop = length + offset;

		BUG_ON(!PageLocked(page));
		DBG_BUGON(!PageLocked(page));

		/* Check for overflow */
		BUG_ON(stop > PAGE_SIZE \|\| stop < length);
		/* Check for potential overflow in debug mode */
		DBG_BUGON(stop > PAGE_SIZE \|\| stop < length);

		if (offset == 0 && stop == PAGE_SIZE)
		while (!managed_cache_releasepage(page, GFP_NOFS))
		@@ -649,7 +648,7 @@ static int erofs_remount(struct super_block sb, int flags, char *data)
		unsigned int org_inject_rate = erofs_get_fault_rate(sbi);
		int err;

		BUG_ON(!sb_rdonly(sb));
		DBG_BUGON(!sb_rdonly(sb));
		err = parse_options(sb, data);
		if (err)
		goto out;