From owner-svn-src-all@FreeBSD.ORG  Fri Sep 18 15:12:32 2009
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 2BC4B106568D;
	Fri, 18 Sep 2009 15:12:32 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 19BC48FC0A;
	Fri, 18 Sep 2009 15:12:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IFCWx2094283;
	Fri, 18 Sep 2009 15:12:32 GMT (envelope-from bms@svn.freebsd.org)
Received: (from bms@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8IFCW2t094281;
	Fri, 18 Sep 2009 15:12:32 GMT (envelope-from bms@svn.freebsd.org)
Message-Id: <200909181512.n8IFCW2t094281@svn.freebsd.org>
From: Bruce M Simpson <bms@FreeBSD.org>
Date: Fri, 18 Sep 2009 15:12:31 +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: r197314 - head/sys/netinet
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: Fri, 18 Sep 2009 15:12:32 -0000

Author: bms
Date: Fri Sep 18 15:12:31 2009
New Revision: 197314
URL: http://svn.freebsd.org/changeset/base/197314

Log:
  Return ENOBUFS consistently if user attempts to exceed
  in_mcast_maxsocksrc resource limit.
  
  Submitted by:	syrinx
  MFC after:	3 days

Modified:
  head/sys/netinet/in_mcast.c

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Fri Sep 18 14:53:01 2009	(r197313)
+++ head/sys/netinet/in_mcast.c	Fri Sep 18 15:12:31 2009	(r197314)
@@ -2427,8 +2427,10 @@ inp_set_source_filters(struct inpcb *inp
 	if (error)
 		return (error);
 
-	if (msfr.msfr_nsrcs > in_mcast_maxsocksrc ||
-	    (msfr.msfr_fmode != MCAST_EXCLUDE &&
+	if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
+		return (ENOBUFS);
+
+	if ((msfr.msfr_fmode != MCAST_EXCLUDE &&
 	     msfr.msfr_fmode != MCAST_INCLUDE))
 		return (EINVAL);