media: rc: Use scnprintf() for avoiding potential buffer overflow
Subsystems (2)
PATCH 1/1 media: rc: Use scnprintf() for avoiding potential buffer overflow
Since snprintf() returns the would-be-output size instead of the actual output size, the succeeding calls may go beyond the given buffer limit. Fix it by replacing with scnprintf().
--- drivers/media/rc/nuvoton-cir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/rc/nuvoton-cir.c +2 -2
@@ -230,10 +230,10 @@ static ssize_t wakeup_data_show(struct device *dev,for (i =0 ; i < fifo_len; i++) { duration =nvt_cir_wake_reg_read (nvt,CIR_WAKE_RD_FIFO_ONLY ); duration = (duration &BUF_LEN_MASK ) *SAMPLE_PERIOD ; - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len, + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"%d " , duration); } - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" ); + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" );spin_unlock_irqrestore (&nvt->lock, flags);
Signature · 1 line
2.16.4
Quoted 6 lines · Takashi Iwai
Since
snprintf()returns the would-be-output size instead of the actual output size, the succeeding calls may go beyond the given buffer limit. Fix it by replacing withscnprintf().Signed-off-by Takashi Iwai <[email protected]>
A gentle reminder for this forgotten patch.
Let me know if any further changes are needed.
thanks,
Takashi
Quoted 24 lines
--- drivers/media/rc/nuvoton-cir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/rc/nuvoton-cir.c +2
-2@@ -230,10 +230,10 @@ static ssize_t wakeup_data_show(struct device *dev,for (i =0 ; i < fifo_len; i++) { duration =nvt_cir_wake_reg_read (nvt,CIR_WAKE_RD_FIFO_ONLY ); duration = (duration &BUF_LEN_MASK ) *SAMPLE_PERIOD ; - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len, + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"%d " , duration); } - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" ); + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" );spin_unlock_irqrestore (&nvt->lock, flags);Signature · 1 line
2.16.4
Sean Young
maintainerQuoted 11 lines · Takashi Iwai
Quoted 6 lines · Takashi Iwai
Since
snprintf()returns the would-be-output size instead of the actual output size, the succeeding calls may go beyond the given buffer limit. Fix it by replacing withscnprintf().Signed-off-by Takashi Iwai <[email protected]>A gentle reminder for this forgotten patch.
Let me know if any further changes are needed.
Thank you for your reminder. The changes look good, unfortunately they missed the deadline for v5.7. I handle them after the next merge window.
Thanks,
Sean
Quoted 30 lines
thanks,
Takashi
Quoted 24 lines
--- drivers/media/rc/nuvoton-cir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/rc/nuvoton-cir.c +2
-2@@ -230,10 +230,10 @@ static ssize_t wakeup_data_show(struct device *dev,for (i =0 ; i < fifo_len; i++) { duration =nvt_cir_wake_reg_read (nvt,CIR_WAKE_RD_FIFO_ONLY ); duration = (duration &BUF_LEN_MASK ) *SAMPLE_PERIOD ; - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len, + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"%d " , duration); } - buf_len +=snprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" ); + buf_len +=scnprintf (buf + buf_len,PAGE_SIZE - buf_len,"\n" );spin_unlock_irqrestore (&nvt->lock, flags);Signature · 1 line
2.16.4