Skip to content

onlp/sysi: Make the ONIE IDPROM buffer pass strict_string_checks #216

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
richardkuo1999 wants to merge 1 commit into
base: support_linux_4.19
Choose a base branch
from
Open

onlp/sysi: Make the ONIE IDPROM buffer pass strict_string_checks #216

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
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as4222-28pe/onlp/builds/x86_64_accton_as4222_28pe/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
9 changes: 5 additions & 4 deletions ...atforms/accton/x86-64/as4630-54pe/onlp/builds/x86_64_accton_as4630_54pe/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as4630-54te/onlp/builds/x86_64_accton_as4630_54pe/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as5822-54x/onlp/builds/x86_64_accton_as5822_54x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as5835-54t/onlp/builds/x86_64_accton_as5835_54t/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as5835-54x/onlp/builds/x86_64_accton_as5835_54x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as5912-54xk/onlp/builds/x86_64_accton_as5912_54xk/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as5915-18x/onlp/builds/x86_64_accton_as5915_18x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as5916-26xb/onlp/builds/x86_64_accton_as5916_26xb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as5916-54x/onlp/builds/x86_64_accton_as5916_54x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as5916-54xk/onlp/builds/x86_64_accton_as5916_54xk/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
char* idprom_path = NULL;
int ret = ONLP_STATUS_OK;

Expand All @@ -66,8 +67,8 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)

idprom_path = (ONLP_STATUS_OK == ret) ? IDPROM_PATH_1 : IDPROM_PATH_2;

if(onlp_file_read(rdata, 256, size, idprom_path) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, idprom_path) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...forms/accton/x86-64/as5916-54xks/onlp/builds/x86_64_accton_as5916_54xks/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as5916-54xl/onlp/builds/x86_64_accton_as5916_54xl/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7315-27xb/onlp/builds/x86_64_accton_as7315_27xb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7316-26xb/onlp/builds/x86_64_accton_as7316_26xb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion ...platforms/accton/x86-64/as7326-56x/onlp/builds/x86_64_accton_as7326_56x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
const int len = 256;
uint8_t* rdata = aim_zmalloc(len);
uint8_t* rdata = aim_zmalloc(len + 1);
char *paths[] = {IDPROM_PATH_2, IDPROM_PATH_1};
int ret = ONLP_STATUS_OK;
int i;
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7535-28xb/onlp/builds/x86_64_accton_as7535_28xb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as7712-32x/onlp/builds/x86_64_accton_as7712_32x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7716-24xc/onlp/builds/x86_64_accton_as7716_24xc/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
int ret = ONLP_STATUS_OK;
int i = 0;
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

for (i = 0; i < 128; i++) {
for (i = 0; i < len / 2; i++) {
ret = onlp_i2c_readw(0, 0x56, i*2, ONLP_I2C_F_FORCE);
if (ret < 0) {
aim_free(rdata);
Expand All @@ -96,7 +97,7 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
rdata[i*2+1] = (ret >> 8) & 0xff;
}

*size = 256;
*size = len;
*data = rdata;

return ONLP_STATUS_OK;
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as7716-32x/onlp/builds/x86_64_accton_as7716_32x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
int ret = ONLP_STATUS_OK;
int i = 0;
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

for (i = 0; i < 128; i++) {
for (i = 0; i < len / 2; i++) {
ret = onlp_i2c_readw(0, 0x56, i*2, ONLP_I2C_F_FORCE);
if (ret < 0) {
aim_free(rdata);
Expand All @@ -69,7 +70,7 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
rdata[i*2+1] = (ret >> 8) & 0xff;
}

*size = 256;
*size = len;
*data = rdata;

return ONLP_STATUS_OK;
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as7726-32x/onlp/builds/x86_64_accton_as7726_32x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...platforms/accton/x86-64/as7816-64x/onlp/builds/x86_64_accton_as7816_64x/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
int ret = ONLP_STATUS_OK;
int i = 0;
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

for (i = 0; i < 128; i++) {
for (i = 0; i < len / 2; i++) {
ret = onlp_i2c_readw(0, 0x56, i*2, ONLP_I2C_F_FORCE);
if (ret < 0) {
aim_free(rdata);
Expand All @@ -74,7 +75,7 @@ onlp_sysi_onie_data_get(uint8_t** data, int* size)
rdata[i*2+1] = (ret >> 8) & 0xff;
}

*size = 256;
*size = len;
*data = rdata;

return ONLP_STATUS_OK;
Expand Down
7 changes: 4 additions & 3 deletions ...forms/accton/x86-64/as7926-40xfb/onlp/builds/x86_64_accton_as7926_40xfb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...forms/accton/x86-64/as7926-40xke/onlp/builds/x86_64_accton_as7926_40xke/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7926-80xk/onlp/builds/x86_64_accton_as7926_80xk/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
7 changes: 4 additions & 3 deletions ...atforms/accton/x86-64/as7946-30xb/onlp/builds/x86_64_accton_as7946_30xb/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
uint8_t* rdata = aim_zmalloc(256);
const int len = 256;
uint8_t* rdata = aim_zmalloc(len + 1);

if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
if(onlp_file_read(rdata, len, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == len) {
*data = rdata;
return ONLP_STATUS_OK;
}
Expand Down
Loading