Skip to contentSkip to conversation

Staging: Pi433: Bugfix for wrong argument for sizeof() in TX thread

PATCH In review Marcus Wolf 2 participants 2 messages Dec 18, 2017 – Dec 19, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: Pi433: Bugfix for wrong argument for sizeof() in TX thread

sizeof(array) != sizeof(pointer to array)
Fixes: "staging: pi433: reduce stack size in tx thread"

---
 drivers/staging/pi433/pi433_if.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/staging/pi433/pi433_if.c +6 -7
index 1f3ba55..6e6f595 100644
@@ -565,7 +565,6 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 	struct pi433_device *device = data;
 	struct spi_device *spi = device->spi;
 	struct pi433_tx_cfg tx_cfg;
-	u8     *buffer = device->buffer;
 	size_t size;
 	bool   rx_interrupted = false;
 	int    position, repetitions;
@@ -614,19 +613,19 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 			size++;
 
 		/* prime buffer */
-		memset(buffer, 0, size);
+		memset(device->buffer, 0, size);
 		position = 0;
 
 		/* add length byte, if requested */
 		if (tx_cfg.enable_length_byte  == OPTION_ON)
-			buffer[position++] = size - 1; /* according to spec length byte itself must be excluded from the length calculation */
+			device->buffer[position++] = size - 1; /* according to spec length byte itself must be excluded from the length calculation */
 
 		/* add adr byte, if requested */
 		if (tx_cfg.enable_address_byte == OPTION_ON)
-			buffer[position++] = tx_cfg.address_byte;
+			device->buffer[position++] = tx_cfg.address_byte;
 
 		/* finally get message data from fifo */
-		retval = kfifo_out(&device->tx_fifo, &buffer[position], sizeof(buffer) - position);
+		retval = kfifo_out(&device->tx_fifo, &device->buffer[position], sizeof(device->buffer) - position);
 		dev_dbg(device->dev, "read %d message byte(s) from fifo queue.", retval);
 		mutex_unlock(&device->tx_fifo_lock);
 
@@ -708,7 +707,7 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 				int temp = device->free_in_fifo;
 				device->free_in_fifo = 0;
 				rf69_write_fifo(spi,
-						&buffer[position],
+						&device->buffer[position],
 						temp);
 				position += temp;
 			} else {
@@ -716,7 +715,7 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 				device->free_in_fifo -= size;
 				repetitions--;
 				rf69_write_fifo(spi,
-						&buffer[position],
+						&device->buffer[position],
 						(size - position));
 				position = 0; /* reset for next repetition */
 			}
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw
Quoted 4 lines · Marcus Wolf

sizeof(array) != sizeof(pointer to array)
Fixes: "staging: pi433: reduce stack size in tx thread"

This should be listed as:

Fixes 62f39d49d168 ("staging: pi433: reduce stack size in tx thread")

right above your signed-off-by line, so we know what patch it really fixes. I'll do that now, but next time it would be great if you could do it.

thanks,

greg k-h