mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Add a test to the end of agentx_varbind_finalize(), after completing the

Browse Source 
full OID, that checks if we're >= searchrange.end. If so, just make it
an endOfMIBView.

OK tb@
This commit is contained in:
martijn 2023-10-29 11:10:07 +00:00
parent 355e536d27
commit c5fcbd5a82
1 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/libagentx/agentx.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: agentx.c,v 1.23 2023/10/24 08:54:52 martijn Exp $ */
/* $OpenBSD: agentx.c,v 1.24 2023/10/29 11:10:07 martijn Exp $ */
/*
* Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
*
@ -2822,7 +2822,7 @@ getnext:
while (axo != NULL && axo->axo_cstate != AX_CSTATE_OPEN)
axo = RB_NEXT(axc_objects, &(axc->axc_objects), axo);
if (axo == NULL ||
ax_oid_cmp(&(axo->axo_oid), &(axv->axv_end)) > 0) {
ax_oid_cmp(&(axo->axo_oid), &(axv->axv_end)) >= 0) {
agentx_varbind_endofmibview(axv);
return;
}
@ -3349,19 +3349,53 @@ agentx_varbind_finalize(struct agentx_varbind *axv)
#endif
}
}
cmp = ax_oid_cmp(&(axv->axv_vb.avb_oid), &oid);
if ((agentx_varbind_request(axv) == AGENTX_REQUEST_TYPE_GETNEXT &&
cmp >= 0) || cmp > 0) {
cmp = ax_oid_cmp(&oid, &(axv->axv_vb.avb_oid));
switch (agentx_varbind_request(axv)) {
case AGENTX_REQUEST_TYPE_GET:
if (cmp != 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "indices not incremented");
agentx_log_axg_fatalx(axg, "index changed");
#else
agentx_log_axg_warnx(axg, "indices not incremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
agentx_log_axg_warnx(axg, "index changed");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
} else
}
break;
case AGENTX_REQUEST_TYPE_GETNEXT:
if (cmp <= 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "indices not incremented");
#else
agentx_log_axg_warnx(axg, "indices not incremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
}
/* FALLTHROUGH */
case AGENTX_REQUEST_TYPE_GETNEXTINCLUSIVE:
if (cmp < 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "index decremented");
#else
agentx_log_axg_warnx(axg, "index decremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
}
if (axv->axv_end.aoi_idlen != 0 &&
ax_oid_cmp(&oid, &(axv->axv_end)) >= 0) {
agentx_varbind_endofmibview(axv);
return;
}
bcopy(&oid, &(axv->axv_vb.avb_oid), sizeof(oid));
}
done:
agentx_object_unlock(axv->axv_axo);
agentx_get_finalize(axv->axv_axg);