From owner-svn-src-all@FreeBSD.ORG  Tue Apr  3 23:46:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 71BFD1065679;
	Tue,  3 Apr 2012 23:46:26 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16])
	by mx1.freebsd.org (Postfix) with ESMTP id 401688FC1C;
	Tue,  3 Apr 2012 23:46:26 +0000 (UTC)
Received: from julian-mac.elischer.org (c-67-180-24-15.hsd1.ca.comcast.net
	[67.180.24.15]) (authenticated bits=0)
	by vps1.elischer.org (8.14.5/8.14.5) with ESMTP id q33NkHHR000308
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO);
	Tue, 3 Apr 2012 16:46:19 -0700 (PDT)
	(envelope-from julian@freebsd.org)
Message-ID: <4F7B8BF0.2000906@freebsd.org>
Date: Tue, 03 Apr 2012 16:46:56 -0700
From: Julian Elischer <julian@freebsd.org>
User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.4; en-US;
	rv:1.9.2.28) Gecko/20120306 Thunderbird/3.1.20
MIME-Version: 1.0
To: Gleb Smirnoff <glebius@freebsd.org>
References: <201203311120.q2VBKmJT099513@svn.freebsd.org>
In-Reply-To: <201203311120.q2VBKmJT099513@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r233745 - head/sys/netinet/ipfw
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2012 23:46:26 -0000

On 3/31/12 4:20 AM, Gleb Smirnoff wrote:


Many years ago there was the possibility that malloc M_WAITOK could
return on shutdown or in some other rare error cases.

Are we certain this is no longer true?

> Author: glebius
> Date: Sat Mar 31 11:20:48 2012
> New Revision: 233745
> URL: http://svn.freebsd.org/changeset/base/233745
>
> Log:
>    Don't check malloc(M_WAITOK) results.
>
> Modified:
>    head/sys/netinet/ipfw/ip_fw_sockopt.c
>
> Modified: head/sys/netinet/ipfw/ip_fw_sockopt.c
> ==============================================================================
> --- head/sys/netinet/ipfw/ip_fw_sockopt.c	Sat Mar 31 10:47:40 2012	(r233744)
> +++ head/sys/netinet/ipfw/ip_fw_sockopt.c	Sat Mar 31 11:20:48 2012	(r233745)
> @@ -163,8 +163,6 @@ ipfw_add_rule(struct ip_fw_chain *chain,
>
>   	l = RULESIZE(input_rule);
>   	rule = malloc(l, M_IPFW, M_WAITOK | M_ZERO);
> -	if (rule == NULL)
> -		return (ENOSPC);
>   	/* get_map returns with IPFW_UH_WLOCK if successful */
>   	map = get_map(chain, 1, 0 /* not locked */);
>   	if (map == NULL) {
> @@ -1010,8 +1008,6 @@ ipfw_ctl(struct sockopt *sopt)
>   			if (size>= sopt->sopt_valsize)
>   				break;
>   			buf = malloc(size, M_TEMP, M_WAITOK);
> -			if (buf == NULL)
> -				break;
>   			IPFW_UH_RLOCK(chain);
>   			/* check again how much space we need */
>   			want = chain->static_len + ipfw_dyn_len();
>
>