From owner-svn-src-all@FreeBSD.ORG  Tue Jan 17 18:10:25 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACBF81065675;
	Tue, 17 Jan 2012 18:10:25 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BA188FC1A;
	Tue, 17 Jan 2012 18:10:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0HIAPTS001716;
	Tue, 17 Jan 2012 18:10:25 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0HIAPCs001714;
	Tue, 17 Jan 2012 18:10:25 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201171810.q0HIAPCs001714@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 17 Jan 2012 18:10:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230272 - head/sys/netgraph
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, 17 Jan 2012 18:10:25 -0000

Author: glebius
Date: Tue Jan 17 18:10:25 2012
New Revision: 230272
URL: http://svn.freebsd.org/changeset/base/230272

Log:
  The newhook method can be called in ISR context at
  certain circumstances, so better use M_NOWAIT in it.

Modified:
  head/sys/netgraph/ng_tag.c

Modified: head/sys/netgraph/ng_tag.c
==============================================================================
--- head/sys/netgraph/ng_tag.c	Tue Jan 17 18:05:13 2012	(r230271)
+++ head/sys/netgraph/ng_tag.c	Tue Jan 17 18:10:25 2012	(r230272)
@@ -303,8 +303,9 @@ ng_tag_newhook(node_p node, hook_p hook,
 	int error;
 
 	/* Create hook private structure. */
-	hip = malloc(sizeof(*hip), M_NETGRAPH_TAG, M_WAITOK | M_ZERO);
-	/* M_WAITOK can't return NULL. */
+	hip = malloc(sizeof(*hip), M_NETGRAPH_TAG, M_NOWAIT | M_ZERO);
+	if (hip == NULL)
+		return (ENOMEM);
 	NG_HOOK_SET_PRIVATE(hook, hip);
 
 	/*