PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soapy: fixing various soapy bugs detected with asan 

- use nof_rx_channels to set rx pointers
- use returned value to set bw
- fix heap use after free
This commit is contained in:
Andre Puschmann 2019-10-25 13:44:15 +02:00
parent ba5f6e9ce4
commit 1d6f72b478
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/src/phy/rf/rf_soapy_imp.c
View File

@ -541,7 +541,6 @@ int rf_soapy_close(void *h)
} }
SoapySDRDevice_unmake(handler->device); SoapySDRDevice_unmake(handler->device);
free(handler);
// print statistics // print statistics
if (handler->num_lates) printf("#lates=%d\n", handler->num_lates); if (handler->num_lates) printf("#lates=%d\n", handler->num_lates);
@ -550,6 +549,8 @@ int rf_soapy_close(void *h)
if (handler->num_time_errors) printf("#time_errors=%d\n", handler->num_time_errors); if (handler->num_time_errors) printf("#time_errors=%d\n", handler->num_time_errors);
if (handler->num_other_errors) printf("#other_errors=%d\n", handler->num_other_errors); if (handler->num_other_errors) printf("#other_errors=%d\n", handler->num_other_errors);
free(handler);
return SRSLTE_SUCCESS; return SRSLTE_SUCCESS;
} }
@ -573,15 +574,17 @@ double rf_soapy_set_rx_srate(void *h, double rate)
// Set bandwidth close to current rate // Set bandwidth close to current rate
size_t bw_length; size_t bw_length;
SoapySDRRange* bw_range = SoapySDRDevice_getBandwidthRange(handler->device, SOAPY_SDR_RX, 0, &bw_length); SoapySDRRange* bw_range = SoapySDRDevice_getBandwidthRange(handler->device, SOAPY_SDR_RX, 0, &bw_length);
double bw = rate * 0.75; for (int k = 0; k < bw_length; ++k) {
bw = SRSLTE_MIN(bw, bw_range->maximum); double bw = rate * 0.75;
bw = SRSLTE_MAX(bw, bw_range->minimum); bw = SRSLTE_MIN(bw, bw_range[k].maximum);
bw = SRSLTE_MAX(bw, 2.5e6); // For the Lime to avoid warnings bw = SRSLTE_MAX(bw, bw_range[k].minimum);
if (SoapySDRDevice_setBandwidth(handler->device, SOAPY_SDR_RX, i, bw) != 0) { bw = SRSLTE_MAX(bw, 2.5e6); // For the Lime to avoid warnings
printf("setBandwidth fail: %s\n", SoapySDRDevice_lastError()); if (SoapySDRDevice_setBandwidth(handler->device, SOAPY_SDR_RX, i, bw) != 0) {
return SRSLTE_ERROR; printf("setBandwidth fail: %s\n", SoapySDRDevice_lastError());
return SRSLTE_ERROR;
}
printf("Set Rx bandwidth to %.2f MHz\n", SoapySDRDevice_getBandwidth(handler->device, SOAPY_SDR_RX, i) / 1e6);
} }
printf("Set Rx bandwidth to %.2f MHz\n", SoapySDRDevice_getBandwidth(handler->device, SOAPY_SDR_RX, i) / 1e6);
#endif #endif
} }
@ -612,16 +615,18 @@ double rf_soapy_set_tx_srate(void *h, double rate)
#if SET_RF_BW #if SET_RF_BW
size_t bw_length; size_t bw_length;
SoapySDRRange* bw_range = SoapySDRDevice_getBandwidthRange(handler->device, SOAPY_SDR_TX, i, &bw_length); SoapySDRRange* bw_range = SoapySDRDevice_getBandwidthRange(handler->device, SOAPY_SDR_TX, i, &bw_length);
// try to set the BW a bit narrower than sampling rate to prevent aliasing but make sure to stay within device for (int k = 0; k < bw_length; ++k) {
// boundaries // try to set the BW a bit narrower than sampling rate to prevent aliasing but make sure to stay within device
double bw = rate * 0.75; // boundaries
bw = SRSLTE_MAX(bw, bw_range->minimum); double bw = rate * 0.75;
bw = SRSLTE_MIN(bw, bw_range->maximum); bw = SRSLTE_MAX(bw, bw_range[k].minimum);
if (SoapySDRDevice_setBandwidth(handler->device, SOAPY_SDR_TX, i, bw) != 0) { bw = SRSLTE_MIN(bw, bw_range[k].maximum);
printf("setBandwidth fail: %s\n", SoapySDRDevice_lastError()); if (SoapySDRDevice_setBandwidth(handler->device, SOAPY_SDR_TX, i, bw) != 0) {
return SRSLTE_ERROR; printf("setBandwidth fail: %s\n", SoapySDRDevice_lastError());
return SRSLTE_ERROR;
}
printf("Set Tx bandwidth to %.2f MHz\n", SoapySDRDevice_getBandwidth(handler->device, SOAPY_SDR_TX, i) / 1e6);
} }
printf("Set Tx bandwidth to %.2f MHz\n", SoapySDRDevice_getBandwidth(handler->device, SOAPY_SDR_TX, i) / 1e6);
#endif #endif
} }
if (rx_stream_active) { if (rx_stream_active) {
@ -749,8 +754,8 @@ int rf_soapy_recv_with_time_multi(void *h,
printf(" - rx_samples=%zd\n", rx_samples); printf(" - rx_samples=%zd\n", rx_samples);
#endif #endif
void* buffs_ptr[SRSLTE_MAX_PORTS]; void* buffs_ptr[SRSLTE_MAX_PORTS] = {};
for (int i = 0; i < SRSLTE_MAX_PORTS; i++) { for (int i = 0; i < handler->num_rx_channels; i++) {
cf_t *data_c = (cf_t*) data[i]; cf_t *data_c = (cf_t*) data[i];
buffs_ptr[i] = &data_c[n]; buffs_ptr[i] = &data_c[n];
} }
@ -874,8 +879,8 @@ int rf_soapy_send_timed_multi(void* h,
printf(" - tx_samples=%zd at timeNs=%llu flags=%d\n", tx_samples, timeNs, flags); printf(" - tx_samples=%zd at timeNs=%llu flags=%d\n", tx_samples, timeNs, flags);
#endif #endif
const void* buffs_ptr[SRSLTE_MAX_PORTS]; const void* buffs_ptr[SRSLTE_MAX_PORTS] = {};
for (int i = 0; i < SRSLTE_MAX_PORTS; i++) { for (int i = 0; i < handler->num_tx_channels; i++) {
cf_t* data_c = data[i] ? data[i] : zero_mem; cf_t* data_c = data[i] ? data[i] : zero_mem;
buffs_ptr[i] = &data_c[n]; buffs_ptr[i] = &data_c[n];
} }