perf: arm-ccn: Use scnprintf() for avoiding potential buffer overflow
PATCH v2 1/1 perf: arm-ccn: Use scnprintf() for avoiding potential buffer overflow
snprintf() is a hard-to-use function, it's especially difficult to use it for concatenating substrings in a buffer with a limited size. Since snprintf() returns the would-be-output size, not the actual size, the subsequent use of snprintf() may point to the incorrect position easily. Although the current code doesn't actually overflow the buffer, it's an incorrect usage.
This patch replaces such snprintf() calls with a safer version, scnprintf().
---v1->v2: Rephrasing the patch description.
Replace the starting snprintf(), too
drivers/perf/arm-ccn.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/perf/arm-ccn.c +10 -10
@@ -328,15 +328,15 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, struct arm_ccn_pmu_event, attr);ssize_t res; - res =snprintf (buf,PAGE_SIZE ,"type=0x%x" , event->type); + res =scnprintf (buf,PAGE_SIZE ,"type=0x%x" , event->type);if (event->event) - res +=snprintf (buf + res,PAGE_SIZE - res,",event=0x%x" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",event=0x%x" , event->event);if (event->def) - res +=snprintf (buf + res,PAGE_SIZE - res,",%s" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",%s" , event->def);if (event->mask) - res +=snprintf (buf + res,PAGE_SIZE - res,",mask=0x%x" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",mask=0x%x" , event->mask);/* Arguments required by an event */
@@ -344,25 +344,25 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev,case CCN_TYPE_CYCLES :break ;case CCN_TYPE_XP : - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",xp=?,vc=?" );if (event->event ==CCN_EVENT_WATCHPOINT ) - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",port=?,dir=?,cmp_l=?,cmp_h=?,mask=?" );else - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",bus=?" );break ;case CCN_TYPE_MN : - res +=snprintf (buf + res,PAGE_SIZE - res,",node=%d" , ccn->mn_id); + res +=scnprintf (buf + res,PAGE_SIZE - res,",node=%d" , ccn->mn_id);break ;default : - res +=snprintf (buf + res,PAGE_SIZE - res,",node=?" ); + res +=scnprintf (buf + res,PAGE_SIZE - res,",node=?" );break ; } - res +=snprintf (buf + res,PAGE_SIZE - res,"\n" ); + res +=scnprintf (buf + res,PAGE_SIZE - res,"\n" );return res; }
Signature · 7 lines
2.16.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 9 lines · Takashi Iwai
snprintf()is a hard-to-use function, it's especially difficult to use it for concatenating substrings in a buffer with a limited size. Sincesnprintf()returns the would-be-output size, not the actual size, the subsequent use ofsnprintf()may point to the incorrect position easily. Although the current code doesn't actually overflow the buffer, it's an incorrect usage.This patch replaces such
snprintf()calls with a safer version,scnprintf().
Thanks for clarifying the commit message. For completeness I think we should drop the final part of the commit title and say:
perf: arm-ccn: use scnprintf() for robustness
... or something like that.
FWIW, either way:
Will, I assume you'll pick this up, if you're happy with that.
Thanks,
Mark.
Quoted 71 lines
Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Takashi Iwai <[email protected]>---
v1->v2: Rephrasing the patch description.
Replace the startingsnprintf(), toodrivers/perf/arm-ccn.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/perf/arm-ccn.c +10
-10@@ -328,15 +328,15 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, struct arm_ccn_pmu_event, attr);ssize_t res; - res =snprintf (buf,PAGE_SIZE ,"type=0x%x" , event->type); + res =scnprintf (buf,PAGE_SIZE ,"type=0x%x" , event->type);if (event->event) - res +=snprintf (buf + res,PAGE_SIZE - res,",event=0x%x" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",event=0x%x" , event->event);if (event->def) - res +=snprintf (buf + res,PAGE_SIZE - res,",%s" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",%s" , event->def);if (event->mask) - res +=snprintf (buf + res,PAGE_SIZE - res,",mask=0x%x" , + res +=scnprintf (buf + res,PAGE_SIZE - res,",mask=0x%x" , event->mask);/* Arguments required by an event */ @@ -344,25 +344,25 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev,case CCN_TYPE_CYCLES :break ;case CCN_TYPE_XP : - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",xp=?,vc=?" );if (event->event ==CCN_EVENT_WATCHPOINT ) - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",port=?,dir=?,cmp_l=?,cmp_h=?,mask=?" );else - res +=snprintf (buf + res,PAGE_SIZE - res, + res +=scnprintf (buf + res,PAGE_SIZE - res,",bus=?" );break ;case CCN_TYPE_MN : - res +=snprintf (buf + res,PAGE_SIZE - res,",node=%d" , ccn->mn_id); + res +=scnprintf (buf + res,PAGE_SIZE - res,",node=%d" , ccn->mn_id);break ;default : - res +=snprintf (buf + res,PAGE_SIZE - res,",node=?" ); + res +=scnprintf (buf + res,PAGE_SIZE - res,",node=?" );break ; } - res +=snprintf (buf + res,PAGE_SIZE - res,"\n" ); + res +=scnprintf (buf + res,PAGE_SIZE - res,"\n" );return res; }Signature · 1 line
2.16.4
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel