From owner-svn-src-all@freebsd.org  Sat Feb  4 16:37:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 231CDCD09D6;
 Sat,  4 Feb 2017 16:37:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF7671B38;
 Sat,  4 Feb 2017 16:37:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v14Gbix3070885;
 Sat, 4 Feb 2017 16:37:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v14GbirE070884;
 Sat, 4 Feb 2017 16:37:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702041637.v14GbirE070884@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 4 Feb 2017 16:37:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r313222 - stable/10/contrib/bsnmp/snmp_usm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2017 16:37:45 -0000

Author: ngie
Date: Sat Feb  4 16:37:43 2017
New Revision: 313222
URL: https://svnweb.freebsd.org/changeset/base/313222

Log:
  MFC r311394:
  
  op_usm_users: don't deref uusers if it's NULL when SETting the value
  
  Add an XXX comment to note that the conditional seems suspect given
  how it's handled elsewhere in the SNMP_OP_SET case.
  
  CID:		1008573

Modified:
  stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c
==============================================================================
--- stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c	Sat Feb  4 16:36:07 2017	(r313221)
+++ stable/10/contrib/bsnmp/snmp_usm/usm_snmp.c	Sat Feb  4 16:37:43 2017	(r313222)
@@ -169,8 +169,12 @@ op_usm_users(struct snmp_context *ctx, s
 		    val->var.subs[sub - 1] != LEAF_usmUserCloneFrom)
 			return (SNMP_ERR_NOSUCHNAME);
 
+		/*
+		 * XXX (ngie): need to investigate the MIB to determine how
+		 * this is possible given some of the transitions below.
+		 */
 		if (community != COMM_INITIALIZE &&
-		    uuser->type == StorageType_readOnly)
+		    uuser != NULL && uuser->type == StorageType_readOnly)
 			return (SNMP_ERR_NOT_WRITEABLE);
 
 		switch (val->var.subs[sub - 1]) {