From owner-svn-src-head@FreeBSD.ORG  Fri Oct 10 00:26:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C5E528A;
 Fri, 10 Oct 2014 00:26:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 1F3B824F;
 Fri, 10 Oct 2014 00:26:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9A0QS3Y006259;
 Fri, 10 Oct 2014 00:26:28 GMT (envelope-from syrinx@FreeBSD.org)
Received: (from syrinx@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9A0QSFU006258;
 Fri, 10 Oct 2014 00:26:28 GMT (envelope-from syrinx@FreeBSD.org)
Message-Id: <201410100026.s9A0QSFU006258@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: syrinx set sender to
 syrinx@FreeBSD.org using -f
From: Shteryana Shopova <syrinx@FreeBSD.org>
Date: Fri, 10 Oct 2014 00:26:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272878 - head/contrib/bsnmp/snmp_target
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2014 00:26:29 -0000

Author: syrinx
Date: Fri Oct 10 00:26:28 2014
New Revision: 272878
URL: https://svnweb.freebsd.org/changeset/base/272878

Log:
  Fix a bug in decoding string indexes in snmp_target(3), thus causing
  bsnmpd(1) to not send v3 notifications properly; while here add two
  missing return statements which could lead to abort() in case of a
  rollback

Modified:
  head/contrib/bsnmp/snmp_target/target_snmp.c

Modified: head/contrib/bsnmp/snmp_target/target_snmp.c
==============================================================================
--- head/contrib/bsnmp/snmp_target/target_snmp.c	Fri Oct 10 00:26:00 2014	(r272877)
+++ head/contrib/bsnmp/snmp_target/target_snmp.c	Fri Oct 10 00:26:28 2014	(r272878)
@@ -301,6 +301,7 @@ op_snmp_target_addrs(struct snmp_context
 		default:
 			break;	
 		}
+		return (SNMP_ERR_NOERROR);
 
 	default:
 		abort();
@@ -625,6 +626,7 @@ op_snmp_notify(struct snmp_context *ctx 
 		default:
 			break;
 		}
+		return (SNMP_ERR_NOERROR);
 
 	default:
 		abort();
@@ -663,13 +665,14 @@ target_append_index(struct asn_oid *oid,
 static int
 target_decode_index(const struct asn_oid *oid, uint sub, char *name)
 {
-	uint32_t i, len;
+	uint32_t i;
 
-	if ((len = oid->len - sub) >= SNMP_ADM_STR32_SIZ)
+	if (oid->len - sub != oid->subs[sub] + 1 || oid->subs[sub] >=
+	    SNMP_ADM_STR32_SIZ)
 		return (-1);
 
-	for (i = 0; i < len; i++)
-		name[i] = oid->subs[sub + i];
+	for (i = 0; i < oid->subs[sub]; i++)
+		name[i] = oid->subs[sub + i + 1];
 	name[i] = '\0';
 
 	return (0);