Attachment 303484 Details for Bug 442333 – patch to close remaining sockets that we accept

[patch] patch to close remaining sockets that we accept

openswan2.patch (text/plain), 1.90 KB, created by Neil Horman on 2008-04-23 11:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-04-23 11:59:05 UTC

Size: 1.90 KB

patch

obsolete

>diff -up openswan-2.6.12/testing/utils/uml_netjig/port.c.orig openswan-2.6.12/testing/utils/uml_netjig/port.c
>--- openswan-2.6.12/testing/utils/uml_netjig/port.c.orig	2008-04-23 07:52:15.000000000 -0400
>+++ openswan-2.6.12/testing/utils/uml_netjig/port.c	2008-04-23 07:53:50.000000000 -0400
>@@ -551,6 +551,7 @@ void accept_connection(struct netjig_sta
>   struct sockaddr addr;
>   struct port *new_port;
>   int len, new;
>+  unsigned long fcntl_arg;
> 
>   len = sizeof(addr);
>   new = accept(nh->ctl_listen_fd, &addr, &len);
>@@ -559,6 +560,13 @@ void accept_connection(struct netjig_sta
>     return;
>   }
> 
>+ /*
>+  * set CLOEXEC it to suppress selenux avc denials on exec
>+  */
>+ fcntl_arg = fcntl(new, F_GETFD);
>+ fcntl_arg |= F_CLOEXEC;
>+ fcntl(new, F_SETFD, fcntl_arg);
>+
> #if 0
>   if(fcntl(new, F_SETFL, O_NONBLOCK) < 0){
>     perror("fcntl - setting O_NONBLOCK");
>diff -up openswan-2.6.12/programs/pluto/rcv_whack.c.orig openswan-2.6.12/programs/pluto/rcv_whack.c
>diff -up openswan-2.6.12/programs/pluto/rcv_info.c.orig openswan-2.6.12/programs/pluto/rcv_info.c
>--- openswan-2.6.12/programs/pluto/rcv_info.c.orig	2008-04-23 07:47:24.000000000 -0400
>+++ openswan-2.6.12/programs/pluto/rcv_info.c	2008-04-23 07:56:37.000000000 -0400
>@@ -19,6 +19,7 @@
> #include <string.h>
> #include <unistd.h>
> #include <errno.h>
>+#include <fcntl.h>
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <sys/un.h>
>@@ -281,6 +282,7 @@ info_handle(int infoctlfd)
> 	int infofd;
> 	err_t err;
> 	struct ipsec_policy_cmd_query ipcq;
>+	unsigned long fcntl_arg;
> 
> 	infofd = accept(infoctlfd, (struct sockaddr *)&info_client_addr
> 	    , &info_addr_len);
>@@ -300,6 +302,13 @@ info_handle(int infoctlfd)
> 	    return;
> 	}
> 
>+	/*
>+	 * set CLOEXEC it to suppress selenux avc denials on exec
>+	 */
>+	fcntl_arg = fcntl(infofd, F_GETFD);
>+	fcntl_arg |= FD_CLOEXEC;
>+	fcntl(infofd, F_SETFD, fcntl_arg);
>+
> 	switch (ipcq.head.ipm_msg_type)
> 	{
> 	case IPSEC_CMD_QUERY_HOSTPAIR:

Actions: View | Diff

Attachments on bug 442333: 302337 | 302339 | 303301 | 303484