diff options
author | syrinx <syrinx@FreeBSD.org> | 2014-10-10 00:26:28 +0000 |
---|---|---|
committer | syrinx <syrinx@FreeBSD.org> | 2014-10-10 00:26:28 +0000 |
commit | f916cb9074c6bae2067718c2d50eb716679d571c (patch) | |
tree | c8626c047eff77ef152da3fb1f6a95ab3dfffe73 /contrib/bsnmp | |
parent | d00756463cd6ef08e7bad7b7833add551b732ec8 (diff) | |
download | FreeBSD-src-f916cb9074c6bae2067718c2d50eb716679d571c.zip FreeBSD-src-f916cb9074c6bae2067718c2d50eb716679d571c.tar.gz |
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
Diffstat (limited to 'contrib/bsnmp')
-rw-r--r-- | contrib/bsnmp/snmp_target/target_snmp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/bsnmp/snmp_target/target_snmp.c b/contrib/bsnmp/snmp_target/target_snmp.c index c6f05de..52b76dc 100644 --- a/contrib/bsnmp/snmp_target/target_snmp.c +++ b/contrib/bsnmp/snmp_target/target_snmp.c @@ -301,6 +301,7 @@ op_snmp_target_addrs(struct snmp_context *ctx __unused, struct snmp_value *val, default: break; } + return (SNMP_ERR_NOERROR); default: abort(); @@ -625,6 +626,7 @@ op_snmp_notify(struct snmp_context *ctx __unused, struct snmp_value *val, default: break; } + return (SNMP_ERR_NOERROR); default: abort(); @@ -663,13 +665,14 @@ target_append_index(struct asn_oid *oid, uint sub, const char *name) 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); |