From 46acb93370e263adc5b544309b76bba66c713127 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Mon, 8 Dec 2014 12:03:24 +0000 Subject: [PATCH] intel_minnow_max.c: fix unsafe strncpy not NULL terminating Signed-off-by: Brendan Le Foll --- src/intel_minnow_max.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/intel_minnow_max.c b/src/intel_minnow_max.c index 9a270e4..a6ca427 100644 --- a/src/intel_minnow_max.c +++ b/src/intel_minnow_max.c @@ -37,7 +37,7 @@ mraa_set_pininfo(mraa_board_t* board, int mraa_index, char *name, mraa_pincapabi { if (mraa_index < board->phy_pin_count) { mraa_pininfo_t* pin_info = &board->pins[mraa_index]; - strncpy(pin_info->name, name, 8); + strncpy(pin_info->name, name, 7); pin_info->capabilites = caps; if (caps.gpio) pin_info->gpio.pinmap = sysfs_pin; @@ -101,27 +101,27 @@ mraa_intel_minnow_max() mraa_set_pininfo(b, 3, "5v", (mraa_pincapabilities_t){0,0,0,0,0,0,0,0}, -1); mraa_set_pininfo(b, 4, "3.3v", (mraa_pincapabilities_t){1,0,0,0,0,0,0,0}, -1); mraa_set_pininfo(b, 5, "SPI_CS", (mraa_pincapabilities_t){1,0,0,0,1,0,0,0}, 220); - mraa_set_pininfo(b, 6, "UART1_TX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 225); - mraa_set_pininfo(b, 7, "SPI_MISO", (mraa_pincapabilities_t){1,0,0,0,1,0,0,0}, 221); - mraa_set_pininfo(b, 8, "UART1_RX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 224); - mraa_set_pininfo(b, 9, "SPI_MOSI", (mraa_pincapabilities_t){1,0,0,0,1,0,0,0}, 222); - mraa_set_pininfo(b, 10, "UART1_CT", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 227); + mraa_set_pininfo(b, 6, "UART1TX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 225); + mraa_set_pininfo(b, 7, "SPIMISO", (mraa_pincapabilities_t){1,0,0,0,1,0,0,0}, 221); + mraa_set_pininfo(b, 8, "UART1RX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 224); + mraa_set_pininfo(b, 9, "SPIMOSI", (mraa_pincapabilities_t){1,0,0,0,1,0,0,0}, 222); + mraa_set_pininfo(b, 10, "UART1CT", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 227); mraa_set_pininfo(b, 11, "SPI_CLK", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 223); - mraa_set_pininfo(b, 12, "UART1_RT", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 226); + mraa_set_pininfo(b, 12, "UART1RT", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 226); mraa_set_pininfo(b, 13, "I2C_SCL", (mraa_pincapabilities_t){1,0,0,0,0,1,0,0}, 243); mraa_set_pininfo(b, 14, "I2S_CLK", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 216); mraa_set_pininfo(b, 15, "I2C_SDA", (mraa_pincapabilities_t){1,0,0,0,0,1,0,0}, 242); mraa_set_pininfo(b, 16, "I2S_FRM", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 217); - mraa_set_pininfo(b, 17, "UART2_TX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 229); + mraa_set_pininfo(b, 17, "UART2TX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 229); mraa_set_pininfo(b, 18, "I2S_DO", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 219); - mraa_set_pininfo(b, 19, "UART2_RX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 228); + mraa_set_pininfo(b, 19, "UART2RX", (mraa_pincapabilities_t){1,0,0,0,0,0,0,1}, 228); mraa_set_pininfo(b, 20, "I2S_DI", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 218); mraa_set_pininfo(b, 21, "S5_0", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 82); mraa_set_pininfo(b, 22, "PWM0", (mraa_pincapabilities_t){1,0,1,0,0,0,0,0}, 248); // Assume BIOS configured for PWM mraa_set_pininfo(b, 23, "S5_1", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 83); mraa_set_pininfo(b, 24, "PWM1", (mraa_pincapabilities_t){1,0,1,0,0,0,0,0}, 249); // Assume BIOS configured for PWM mraa_set_pininfo(b, 25, "S5_4", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 84); - mraa_set_pininfo(b, 26, "IBL_8254", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 208); + mraa_set_pininfo(b, 26, "IBL8254", (mraa_pincapabilities_t){1,1,0,0,0,0,0,0}, 208); // Set number of i2c adaptors // Got this from running 'i2cdetect -l'