Module Name: src Committed By: enami Date: Mon Jun 27 00:45:50 UTC 2011
Modified Files: src/sys/netinet: ip_reass.c Log Message: Don't increment ip_nfragpackets when failed to allocate fragment queue. No one will decrement it on such case. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/ip_reass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet/ip_reass.c diff -u src/sys/netinet/ip_reass.c:1.7 src/sys/netinet/ip_reass.c:1.8 --- src/sys/netinet/ip_reass.c:1.7 Fri Nov 5 00:21:51 2010 +++ src/sys/netinet/ip_reass.c Mon Jun 27 00:45:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_reass.c,v 1.7 2010/11/05 00:21:51 rmind Exp $ */ +/* $NetBSD: ip_reass.c,v 1.8 2011/06/27 00:45:50 enami Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.7 2010/11/05 00:21:51 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.8 2011/06/27 00:45:50 enami Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -267,11 +267,11 @@ else if (ip_nfragpackets >= ip_maxfragpackets) { goto dropfrag; } - ip_nfragpackets++; fp = malloc(sizeof(ipfr_queue_t), M_FTABLE, M_NOWAIT); if (fp == NULL) { goto dropfrag; } + ip_nfragpackets++; TAILQ_INIT(&fp->ipq_fragq); fp->ipq_nfrags = 1; fp->ipq_ttl = IPFRAGTTL;