snmp_output_err_resp, snmp_output_resp: allocate object
using calloc, not
on the stack Some of the callers try to determine whether or not `object` is valid by testing the value for NULL, which will never be true if it's a stack value, so in order to be clear and correct down the call stack, use a heap allocated object. This also addresses a Coverity issue by initializing all of `object` via calloc MFC after: 1 week Reported by: Coverity CID: 1006392
This commit is contained in:
parent
09fe010ecf
commit
86b3c16952
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=310987
@ -2003,20 +2003,25 @@ snmp_output_object(struct snmp_toolinfo *snmptoolctx, struct snmp_object *o)
|
||||
void
|
||||
snmp_output_err_resp(struct snmp_toolinfo *snmptoolctx, struct snmp_pdu *pdu)
|
||||
{
|
||||
struct snmp_object *object;
|
||||
char buf[ASN_OIDSTRLEN];
|
||||
struct snmp_object object;
|
||||
|
||||
if (pdu == NULL || (pdu->error_index > (int32_t) pdu->nbindings)) {
|
||||
fprintf(stdout, "Invalid error index in PDU\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((object = calloc(1, sizeof(struct snmp_object))) != NULL) {
|
||||
fprintf(stdout, "calloc: %s", strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
fprintf(stdout, "Agent %s:%s returned error \n", snmp_client.chost,
|
||||
snmp_client.cport);
|
||||
|
||||
if (!ISSET_NUMERIC(snmptoolctx) && (snmp_fill_object(snmptoolctx, &object,
|
||||
if (!ISSET_NUMERIC(snmptoolctx) && (snmp_fill_object(snmptoolctx, object,
|
||||
&(pdu->bindings[pdu->error_index - 1])) > 0))
|
||||
snmp_output_object(snmptoolctx, &object);
|
||||
snmp_output_object(snmptoolctx, object);
|
||||
else {
|
||||
asn_oid2str_r(&(pdu->bindings[pdu->error_index - 1].var), buf);
|
||||
fprintf(stdout,"%s", buf);
|
||||
@ -2028,17 +2033,23 @@ snmp_output_err_resp(struct snmp_toolinfo *snmptoolctx, struct snmp_pdu *pdu)
|
||||
fprintf(stdout, "%s\n", error_strings[pdu->error_status].str);
|
||||
else
|
||||
fprintf(stdout,"%s\n", error_strings[SNMP_ERR_UNKNOWN].str);
|
||||
|
||||
free(object);
|
||||
object = NULL;
|
||||
}
|
||||
|
||||
int32_t
|
||||
snmp_output_resp(struct snmp_toolinfo *snmptoolctx, struct snmp_pdu *pdu,
|
||||
struct asn_oid *root)
|
||||
{
|
||||
struct snmp_object object;
|
||||
struct snmp_object *object;
|
||||
char p[ASN_OIDSTRLEN];
|
||||
int32_t error;
|
||||
uint32_t i;
|
||||
|
||||
if ((object = calloc(1, sizeof(struct snmp_object))) == NULL)
|
||||
return (-1);
|
||||
|
||||
i = error = 0;
|
||||
while (i < pdu->nbindings) {
|
||||
if (root != NULL && !(asn_is_suboid(root,
|
||||
@ -2047,18 +2058,22 @@ snmp_output_resp(struct snmp_toolinfo *snmptoolctx, struct snmp_pdu *pdu,
|
||||
|
||||
if (GET_OUTPUT(snmptoolctx) != OUTPUT_QUIET) {
|
||||
if (!ISSET_NUMERIC(snmptoolctx) &&
|
||||
(snmp_fill_object(snmptoolctx, &object,
|
||||
(snmp_fill_object(snmptoolctx, object,
|
||||
&(pdu->bindings[i])) > 0))
|
||||
snmp_output_object(snmptoolctx, &object);
|
||||
snmp_output_object(snmptoolctx, object);
|
||||
else {
|
||||
asn_oid2str_r(&(pdu->bindings[i].var), p);
|
||||
fprintf(stdout, "%s", p);
|
||||
}
|
||||
}
|
||||
error |= snmp_output_numval(snmptoolctx, &(pdu->bindings[i]), object.info);
|
||||
error |= snmp_output_numval(snmptoolctx, &(pdu->bindings[i]),
|
||||
object->info);
|
||||
i++;
|
||||
}
|
||||
|
||||
free(object);
|
||||
object = NULL;
|
||||
|
||||
if (error)
|
||||
return (-1);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user