Skip to content

bounds-check packet code before indexing fr_radius_packet_name[] #5879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aizu-m wants to merge 1 commit into from
+9 −5
Closed

bounds-check packet code before indexing fr_radius_packet_name[] #5879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/radclient-ng.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ static void client_read(fr_event_list_t *el, int fd, UNUSED int flags, void *uct
* packet matched that.
*/
if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (reply->code != request->filter_code)) {
if (FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
fr_radius_packet_name[reply->code]);
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/bin/radclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
* packet matched that.
*/
if (request->packet->code != request->filter_code) {
if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(request->packet->code)) {
REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
fr_radius_packet_name[request->packet->code]);
} else {
Expand Down Expand Up @@ -1625,7 +1625,7 @@ static int recv_one_packet(fr_time_delta_t wait_time)
* packet matched that.
*/
if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (request->reply->code != request->filter_code)) {
if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
fr_radius_packet_name[request->reply->code]);
} else {
Expand Down
8 changes: 6 additions & 2 deletions src/bin/radsniff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,9 @@ int main(int argc, char *argv[])
DEBUG2(" RADIUS secret : [%s]", conf->radius_secret);

if (conf->filter_request_code) {
DEBUG2(" RADIUS request code : [%s]", fr_radius_packet_name[conf->filter_request_code]);
DEBUG2(" RADIUS request code : [%s]",
FR_RADIUS_PACKET_CODE_VALID(conf->filter_request_code) ?
fr_radius_packet_name[conf->filter_request_code] : "unknown");
}

if (!fr_pair_list_empty(&conf->filter_request_vps)){
Expand All @@ -2917,7 +2919,9 @@ int main(int argc, char *argv[])
}

if (conf->filter_response_code) {
DEBUG2(" RADIUS response code : [%s]", fr_radius_packet_name[conf->filter_response_code]);
DEBUG2(" RADIUS response code : [%s]",
FR_RADIUS_PACKET_CODE_VALID(conf->filter_response_code) ?
fr_radius_packet_name[conf->filter_response_code] : "unknown");
}

if (conf->to_output_dir) {
Expand Down