Skip to contentSkip to conversation

fdtable: Delete pointless code in dup_fd().

PATCH In review Vadim Lobanov 1 participant 1 message Oct 6, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 fdtable: Delete pointless code in dup_fd().

The dup_fd() function creates a new files_struct and fdtable embedded inside that files_struct, and then possibly expands the fdtable using expand_files(). The out_release error path is invoked when expand_files() returns an error code. However, when this attempt to expand fails, the fdtable is left in its original embedded form, so it is pointless to try to free the associated fdarray and fdsets.

kernel/fork.c +1 -4
diff -Npru old/kernel/fork.c new/kernel/fork.c
@@ -727,14 +727,11 @@ static struct files_struct *dup_fd(struc
 		memset(&new_fdt->close_on_exec->fds_bits[start], 0, left);
 	}
 
-out:
 	return newf;
 
 out_release:
-	free_fdset (new_fdt->close_on_exec, new_fdt->max_fdset);
-	free_fdset (new_fdt->open_fds, new_fdt->max_fdset);
-	free_fd_array(new_fdt->fd, new_fdt->max_fds);
 	kmem_cache_free(files_cachep, newf);
+out:
 	return NULL;
 }