[Cluster-devel] cluster/cman/daemon daemon.c

[pcaulfield at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2007-06-21 07:39:49

Modified files:
	cman/daemon    : daemon.c 

Log message:
	Patch potential local buffer overflow DoS. Thanks to Fabio Massimo Di Nitto
	bz#244891

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/daemon.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.32.2.1&r2=1.32.2.2

--- cluster/cman/daemon/daemon.c	2007/01/08 10:08:48	1.32.2.1
+++ cluster/cman/daemon/daemon.c	2007/06/21 07:39:49	1.32.2.2
@@ -157,6 +157,8 @@
 		int len;
 		int totallen = 0;
 
+		memset(buf, 0, (MAX_CLUSTER_MESSAGE + sizeof(struct sock_header)));
+
 		len = read(fd, buf, sizeof(struct sock_header));
 
 		P_DAEMON("read %d bytes from fd %d\n", len, fd);
@@ -185,6 +187,11 @@
 			send_status_return(con, msg->command, -EINVAL);
 			return 0;
 		}
+		if ((msg->length-len) > MAX_CLUSTER_MESSAGE) {
+			P_DAEMON("message on socket is too big\n");
+			send_status_return(con, msg->command, -EINVAL);
+			return 0;
+		}
 
 		totallen = len;