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

Commit 3aa0ce82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Un-inline the core-dump helper functions 



Tony Luck reports that the addition of the access_ok() check in commit
0eead9ab ("Don't dump task struct in a.out core-dumps") broke the
ia64 compile due to missing the necessary header file includes.

Rather than add yet another include (<asm/unistd.h>) to make everything
happy, just uninline the silly core dump helper functions and move the
bodies to fs/exec.c where they make a lot more sense.

dump_seek() in particular was too big to be an inline function anyway,
and none of them are in any way performance-critical.  And we really
don't need to mess up our include file headers more than they already
are.

Reported-and-tested-by: default avatarTony Luck <tony.luck@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae42d8d4

fs/exec.c

+38 −0
Original line number Diff line number Diff line
@@ -2014,3 +2014,41 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) 
fail:

	return;

}



/*

 * Core dumping helper functions.  These are the only things you should

 * do on a core-file: use only these functions to write out all the

 * necessary info.

 */

int dump_write(struct file *file, const void *addr, int nr)

{

	return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;

}



int dump_seek(struct file *file, loff_t off)

{

	int ret = 1;



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

		if (file->f_op->llseek(file, off, SEEK_CUR) < 0)

			return 0;

	} else {

		char *buf = (char *)get_zeroed_page(GFP_KERNEL);



		if (!buf)

			return 0;

		while (off > 0) {

			unsigned long n = off;



			if (n > PAGE_SIZE)

				n = PAGE_SIZE;

			if (!dump_write(file, buf, n)) {

				ret = 0;

				break;

			}

			off -= n;

		}

		free_page((unsigned long)buf);

	}

	return ret;

}

include/linux/coredump.h

+2 −32
Original line number Diff line number Diff line
@@ -9,37 +9,7 @@ 
 * These are the only things you should do on a core-file: use only these

 * functions to write out all the necessary info.

 */

static inline int dump_write(struct file *file, const void *addr, int nr)

{

	return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;

}



static inline int dump_seek(struct file *file, loff_t off)

{

	int ret = 1;



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

		if (file->f_op->llseek(file, off, SEEK_CUR) < 0)

			return 0;

	} else {

		char *buf = (char *)get_zeroed_page(GFP_KERNEL);



		if (!buf)

			return 0;

		while (off > 0) {

			unsigned long n = off;



			if (n > PAGE_SIZE)

				n = PAGE_SIZE;

			if (!dump_write(file, buf, n)) {

				ret = 0;

				break;

			}

			off -= n;

		}

		free_page((unsigned long)buf);

	}

	return ret;

}

extern int dump_write(struct file *file, const void *addr, int nr);

extern int dump_seek(struct file *file, loff_t off);



#endif /* _LINUX_COREDUMP_H */