Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro.

The most notable fix here is probably the fix for a splice regression
("fix a fencepost error in pipe_advance()") noticed by Alan Wylie.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a fencepost error in pipe_advance()
  coredump: Ensure proper size of sparse core files
  aio: fix lock dep warning
  tmpfs: clear S_ISGID when setting posix ACLs
parents 34241af7 b9dc6f65

fs/aio.c

+4 −2
Original line number Diff line number Diff line
@@ -1085,6 +1085,7 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2) 
		 * Tell lockdep we inherited freeze protection from submission

		 * thread.

		 */

		if (S_ISREG(file_inode(file)->i_mode))

			__sb_writers_acquired(file_inode(file)->i_sb, SB_FREEZE_WRITE);

		file_end_write(file);

	}
@@ -1525,6 +1526,7 @@ static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored, 
		 * by telling it the lock got released so that it doesn't

		 * complain about held lock when we return to userspace.

		 */

		if (S_ISREG(file_inode(file)->i_mode))

			__sb_writers_release(file_inode(file)->i_sb, SB_FREEZE_WRITE);

	}

	kfree(iovec);

fs/binfmt_elf.c

+1 −0
Original line number Diff line number Diff line
@@ -2298,6 +2298,7 @@ static int elf_core_dump(struct coredump_params *cprm) 
				goto end_coredump;

		}

	}

	dump_truncate(cprm);



	if (!elf_core_write_extra_data(cprm))

		goto end_coredump;

fs/coredump.c

+18 −0
Original line number Diff line number Diff line
@@ -833,3 +833,21 @@ int dump_align(struct coredump_params *cprm, int align) 
	return mod ? dump_skip(cprm, align - mod) : 1;

}

EXPORT_SYMBOL(dump_align);



/*

 * Ensures that file size is big enough to contain the current file

 * postion. This prevents gdb from complaining about a truncated file

 * if the last "write" to the file was dump_skip.

 */

void dump_truncate(struct coredump_params *cprm)

{

	struct file *file = cprm->file;

	loff_t offset;



	if (file->f_op->llseek && file->f_op->llseek != no_llseek) {

		offset = file->f_op->llseek(file, 0, SEEK_CUR);

		if (i_size_read(file->f_mapping->host) < offset)

			do_truncate(file->f_path.dentry, offset, 0, file);

	}

}

EXPORT_SYMBOL(dump_truncate);

fs/posix_acl.c

+4 −5
Original line number Diff line number Diff line
@@ -922,11 +922,10 @@ int simple_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	int error;



	if (type == ACL_TYPE_ACCESS) {

		error = posix_acl_equiv_mode(acl, &inode->i_mode);

		if (error < 0)

			return 0;

		if (error == 0)

			acl = NULL;

		error = posix_acl_update_mode(inode,

				&inode->i_mode, &acl);

		if (error)

			return error;

	}



	inode->i_ctime = current_time(inode);

include/linux/coredump.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ struct coredump_params; 
extern int dump_skip(struct coredump_params *cprm, size_t nr);

extern int dump_emit(struct coredump_params *cprm, const void *addr, int nr);

extern int dump_align(struct coredump_params *cprm, int align);

extern void dump_truncate(struct coredump_params *cprm);

#ifdef CONFIG_COREDUMP

extern void do_coredump(const siginfo_t *siginfo);

#else