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

Commit 6e667260 authored by Prasanna Meda's avatar Prasanna Meda Committed by Linus Torvalds
Browse files

[PATCH] dup fd error fix 



Set errorp in dup_fd, it will be used in sys_unshare also.

Signed-off-by: default avatarPrasanna Meda <mlp@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 538c5902

kernel/fork.c

+2 −1
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ static struct files_struct *alloc_files(void) 
/*

 * Allocate a new files structure and copy contents from the

 * passed in files structure.

 * errorp will be valid only when the returned files_struct is NULL.

 */

static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp)

{
@@ -633,6 +634,7 @@ static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) 
	int open_files, size, i, expand;

	struct fdtable *old_fdt, *new_fdt;



	*errorp = -ENOMEM;

	newf = alloc_files();

	if (!newf)

		goto out;
@@ -746,7 +748,6 @@ static int copy_files(unsigned long clone_flags, struct task_struct * tsk) 
	 * break this.

	 */

	tsk->files = NULL;

	error = -ENOMEM;

	newf = dup_fd(oldf, &error);

	if (!newf)

		goto out;