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

Merge tag 'fs_for_v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull udf and quota fixes from Jan Kara:
 "Fixes for crashes in UDF when inode expansion fails and one quota
  cleanup"

* tag 'fs_for_v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: cleanup double word in comment
  udf: Restore i_lenAlloc when inode expansion fails
  udf: Fix NULL ptr deref when converting from inline format
parents 145d9b49 9daf0a4d

fs/udf/inode.c

+4 −5
Original line number Diff line number Diff line
@@ -258,10 +258,6 @@ int udf_expand_file_adinicb(struct inode *inode) 
	char *kaddr;

	struct udf_inode_info *iinfo = UDF_I(inode);

	int err;

	struct writeback_control udf_wbc = {

		.sync_mode = WB_SYNC_NONE,

		.nr_to_write = 1,

	};



	WARN_ON_ONCE(!inode_is_locked(inode));

	if (!iinfo->i_lenAlloc) {
@@ -305,8 +301,10 @@ int udf_expand_file_adinicb(struct inode *inode) 
		iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;

	/* from now on we have normal address_space methods */

	inode->i_data.a_ops = &udf_aops;

	set_page_dirty(page);

	unlock_page(page);

	up_write(&iinfo->i_data_sem);

	err = inode->i_data.a_ops->writepage(page, &udf_wbc);

	err = filemap_fdatawrite(inode->i_mapping);

	if (err) {

		/* Restore everything back so that we don't lose data... */

		lock_page(page);
@@ -317,6 +315,7 @@ int udf_expand_file_adinicb(struct inode *inode) 
		unlock_page(page);

		iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;

		inode->i_data.a_ops = &udf_adinicb_aops;

		iinfo->i_lenAlloc = inode->i_size;

		up_write(&iinfo->i_data_sem);

	}

	put_page(page);

include/linux/quota.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ extern bool qid_valid(struct kqid qid); 
 *

 *	When there is no mapping defined for the user-namespace, type,

 *	qid tuple an invalid kqid is returned.  Callers are expected to

 *	test for and handle handle invalid kqids being returned.

 *	test for and handle invalid kqids being returned.

 *	Invalid kqids may be tested for using qid_valid().

 */

static inline struct kqid make_kqid(struct user_namespace *from,