BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

asix-sigma: fix out-of-range access to the samplerates[] array 

Commit 2c9c0df86e removed the sentinel from the samplerates[] array,
but did not adjust the test which checked whether a rate is listed in
the set of supported rates. This could result in an out-of-range access
beyond the array's last item.

Fix the "listed?" check after iterating the table of supported rates.
Cope with either presence or absence of a sentinel in the array.

Address some more style nits while we are here. Rename an identifier
for a local variable which unintentionally might suggest that it would
be a preprocessor macro (all-caps). Reduce redundancy in data type
references as well as in the determination of the array size.

Signed-off-by: Gerhard Sittig <gerhard.sittig@gmx.net>
This commit is contained in:
Gerhard Sittig 2016-10-16 18:25:19 +02:00 committed by Uwe Hermann
parent 387825dcb1
commit 4154a516de
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/asix-sigma/api.c
View File

@ -259,7 +259,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
SAMPLERATES_COUNT, sizeof(uint64_t)); samplerates_count, sizeof(samplerates[0]));
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb); *data = g_variant_builder_end(&gvb);
break; break;

8
src/hardware/asix-sigma/protocol.c
View File

@ -51,7 +51,7 @@ SR_PRIV const uint64_t samplerates[] = {
SR_MHZ(200), /* Special FW needed */ SR_MHZ(200), /* Special FW needed */
}; };
SR_PRIV const int SAMPLERATES_COUNT = ARRAY_SIZE(samplerates); SR_PRIV const size_t samplerates_count = ARRAY_SIZE(samplerates);
static const char sigma_firmware_files[][24] = { static const char sigma_firmware_files[][24] = {
/* 50 MHz, supports 8 bit fractions */ /* 50 MHz, supports 8 bit fractions */
@ -523,18 +523,18 @@ SR_PRIV int sigma_set_samplerate(const struct sr_dev_inst *sdi, uint64_t sampler
{ {
struct dev_context *devc; struct dev_context *devc;
struct drv_context *drvc; struct drv_context *drvc;
unsigned int i; size_t i;
int ret; int ret;
devc = sdi->priv; devc = sdi->priv;
drvc = sdi->driver->context; drvc = sdi->driver->context;
ret = SR_OK; ret = SR_OK;
for (i = 0; i < ARRAY_SIZE(samplerates); i++) { for (i = 0; i < samplerates_count; i++) {
if (samplerates[i] == samplerate) if (samplerates[i] == samplerate)
break; break;
} }
if (samplerates[i] == 0) if (i >= samplerates_count || samplerates[i] == 0)
return SR_ERR_SAMPLERATE; return SR_ERR_SAMPLERATE;
if (samplerate <= SR_MHZ(50)) { if (samplerate <= SR_MHZ(50)) {

3
src/hardware/asix-sigma/protocol.h
View File

@ -23,6 +23,7 @@
#define LIBSIGROK_HARDWARE_ASIX_SIGMA_PROTOCOL_H #define LIBSIGROK_HARDWARE_ASIX_SIGMA_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#include <glib.h> #include <glib.h>
#include <ftdi.h> #include <ftdi.h>
#include <string.h> #include <string.h>
@ -221,7 +222,7 @@ struct dev_context {
}; };
extern SR_PRIV const uint64_t samplerates[]; extern SR_PRIV const uint64_t samplerates[];
extern SR_PRIV const int SAMPLERATES_COUNT; extern SR_PRIV const size_t samplerates_count;
SR_PRIV int sigma_write_register(uint8_t reg, uint8_t *data, size_t len, SR_PRIV int sigma_write_register(uint8_t reg, uint8_t *data, size_t len,
struct dev_context *devc); struct dev_context *devc);