X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Fcompat.c;h=d74d82155d78e20cd008a289751bcaca70b27f7a;hb=235f157f22f2a29d7435bcae5c3ace994c19fa46;hp=9a0f5f2b90c80653acbe2282d3820e8502307429;hpb=4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c;p=linux-2.6-omap-h63xx.git

diff --git a/net/compat.c b/net/compat.c
index 9a0f5f2b90c..d74d82155d7 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -276,7 +276,8 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
 		err = security_file_receive(fp[i]);
 		if (err)
 			break;
-		err = get_unused_fd();
+		err = get_unused_fd_flags(MSG_CMSG_CLOEXEC & kmsg->msg_flags
+					  ? O_CLOEXEC : 0);
 		if (err < 0)
 			break;
 		new_fd = err;