Skip to content

Add bounds check before memcpy/strncpy in dump_pool_info handler #9110

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

Open
Pyolar wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −23
Open

Add bounds check before memcpy/strncpy in dump_pool_info handler #9110

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
23 changes: 0 additions & 23 deletions src/jrd/svc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,18 +1250,6 @@ ISC_STATUS Service::query2(thread_db* /*tdbb*/,
}
break;

case isc_info_svc_dump_pool_info:
{
char fname[MAXPATHLEN];
size_t length2 = gds__vax_integer(items, sizeof(USHORT));
if (length2 >= sizeof(fname))
length2 = sizeof(fname) - 1; // truncation
items += sizeof(USHORT);
strncpy(fname, (const char*) items, length2);
fname[length2] = 0;
break;
}

case isc_info_svc_get_config:
// TODO: iterate through all integer-based config values
// and return them to the client
Expand Down Expand Up @@ -1704,17 +1692,6 @@ void Service::query(USHORT send_item_length,
// need_admin_privs(status, "isc_info_svc_get_env");
break;

case isc_info_svc_dump_pool_info:
{
char fname[MAXPATHLEN];
size_t length2 = gds__vax_integer(items, sizeof(USHORT));
if (length2 >= sizeof(fname))
length2 = sizeof(fname) - 1; // truncation
items += sizeof(USHORT);
memcpy(fname, items, length2);
fname[length2] = 0;
break;
}
/*
case isc_info_svc_get_config:
// TODO: iterate through all integer-based config values
Expand Down