From owner-p4-projects@FreeBSD.ORG  Wed Aug 30 21:45:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9DB6D16A4DE; Wed, 30 Aug 2006 21:45:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5D72716A4DA
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:45:37 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2482E43D53
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:45:37 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ULjbdx039287
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:45:37 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ULjajR039284
	for perforce@freebsd.org; Wed, 30 Aug 2006 21:45:36 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 30 Aug 2006 21:45:36 GMT
Message-Id: <200608302145.k7ULjajR039284@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105375 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Aug 2006 21:45:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=105375

Change 105375 by piso@piso_newluxor on 2006/08/30 21:45:28

	Fix a forgotten rw_runlock() and try to be a bit more style 
	friendly.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#11 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#11 (text+ko) ====

@@ -2120,7 +2120,7 @@
 	int sof_redir = sizeof(struct cfg_redir);
 	int sof_spool = sizeof(struct cfg_spool);
 	struct cfg_redir *r, *ser_r;
-	struct cfg_spool *s, *ser_s;		
+	struct cfg_spool *s, *ser_s;
 	int cnt, off, i;
 	char *panic_err;
 
@@ -2177,10 +2177,10 @@
 			break; 
 		}
 		if (r->alink[0] == NULL) {
-			panic_err = "LibAliasRedirect* returned NULL!!!\n";
+			panic_err = "LibAliasRedirect* returned NULL";
 			goto bad;
 		} else /* LSNAT handling. */
-			for (i=0; i < r->spool_cnt; i++) {
+			for (i = 0; i < r->spool_cnt; i++) {
 				ser_s = (struct cfg_spool *)&buf[off];
 				s = malloc(sof_redir, M_IPFW, M_NOWAIT | M_ZERO);
 				if (s == NULL) {
@@ -4650,18 +4650,21 @@
 							bcopy(s, &data[off], sof_spool);
 							off += sof_spool;
 						     } else
-							     break;
+							     goto nospace;
 						}
 					} else
-						break;
+						goto nospace;
 				}
 			} else
-				break;			
+				goto nospace;
 		}
 		NAT_RUNLOCK(&nat_chain_rwl);
-
 		error = sooptcopyout(sopt, data, NAT_BUF_LEN);
 		free(data, M_IPFW);
+	nospace:
+		NAT_RUNLOCK(&nat_chain_rwl);
+		printf("serialized data buffer not big enough: please increase NAT_BUF_LEN\n");
+		free(data, M_IPFW);
 	}
 	break;
 
@@ -4680,8 +4683,10 @@
 			cnt++;
 			size = cnt * (sof + sizeof(int));
 			data = realloc(data, size, M_IPFW, M_NOWAIT | M_ZERO);
-			if (data == NULL) 
+			if (data == NULL) {
+				NAT_RUNLOCK(&nat_chain_rwl);
 				return (ENOSPC);
+			}
 			bcopy(&ptr->id, &data[i], sizeof(int));
 			i += sizeof(int);
 			bcopy(ptr->lib->logDesc, &data[i], sof);