Skip to content

libbladeRF: fix buffer overflows and a missing NULL check in gain calibration #1074

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
wormuz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libbladeRF: fix buffer overflows and a missing NULL check in gain calibration #1074

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
10 changes: 10 additions & 0 deletions host/libraries/libbladeRF/src/bladerf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,6 +2234,12 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const
}

if (cal_file_loc != NULL) {
if (strlen(cal_file_loc) >= filename_len) {
log_error("Gain calibration path is too long (%zu >= %zu)\n",
strlen(cal_file_loc), filename_len);
status = BLADERF_ERR_INVAL;
goto error;
}
strcpy(filename, cal_file_loc);
} else {
log_debug("No calibration file specified, using serial number\n");
Expand All @@ -2256,6 +2262,10 @@ int bladerf_load_gain_calibration(struct bladerf *dev, bladerf_channel ch, const

/** Convert to binary format if CSV */
full_path_bin = (char*)malloc(strlen(full_path) + 1);
if (full_path_bin == NULL) {
status = BLADERF_ERR_MEM;
goto error;
}
strcpy(full_path_bin, full_path);
ext = strstr(full_path_bin, ".csv");
if (ext) {
Expand Down
8 changes: 6 additions & 2 deletions host/libraries/libbladeRF/src/device_calibration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,13 @@ int gain_cal_csv_to_bin(struct bladerf *dev, const char *csv_path, const char *b
if (!csvFile || !binaryFile) {
status = BLADERF_ERR_NO_FILE;
if (getcwd(current_dir, sizeof(current_dir)) != NULL) {
log_error("Error opening calibration file: %s\n", strcat(current_dir, csv_path));
/* strcat() here appends a caller-supplied path of arbitrary
* length to a buffer already holding the working directory,
* overflowing it for long paths. Print the two parts instead. */
log_error("Error opening calibration file: %s/%s\n",
current_dir, csv_path);
} else {
log_error("Error opening calibration file\n");
log_error("Error opening calibration file: %s\n", csv_path);
}
goto error;
}
Expand Down