| From 3610a2add39365a0f153154c60169a66c616d50f Mon Sep 17 00:00:00 2001 |
| From: Mike Danese <mikedanese@google.com> |
| Date: Thu, 19 May 2016 21:54:51 -0700 |
| Subject: mpssd: fix buffer overflow warning |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Mike Danese <mikedanese@google.com> |
| |
| commit 3610a2add39365a0f153154c60169a66c616d50f upstream. |
| |
| The compilation emits a warning in function ‘snprintf’, |
| inlined from ‘set_cmdline’ at |
| ../Documentation/mic/mpssd/mpssd.c:1541:9: |
| /usr/include/x86_64-linux-gnu/bits/stdio2.h:64:10: |
| warning: call to __builtin___snprintf_chk will always overflow |
| destination buffer |
| |
| This was introduced in commit f4a66c204482 ("misc: mic: Update MIC host |
| daemon with COSM changes") and is fixed by reverting the changes to the |
| size argument of these snprintf statements. |
| |
| Cc: Ashutosh Dixit <ashutosh.dixit@intel.com> |
| Signed-off-by: Mike Danese <mikedanese@google.com> |
| Signed-off-by: Jonathan Corbet <corbet@lwn.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| Documentation/mic/mpssd/mpssd.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/Documentation/mic/mpssd/mpssd.c |
| +++ b/Documentation/mic/mpssd/mpssd.c |
| @@ -1538,9 +1538,9 @@ set_cmdline(struct mic_info *mic) |
| |
| len = snprintf(buffer, PATH_MAX, |
| "clocksource=tsc highres=off nohz=off "); |
| - len += snprintf(buffer + len, PATH_MAX, |
| + len += snprintf(buffer + len, PATH_MAX - len, |
| "cpufreq_on;corec6_off;pc3_off;pc6_off "); |
| - len += snprintf(buffer + len, PATH_MAX, |
| + len += snprintf(buffer + len, PATH_MAX - len, |
| "ifcfg=static;address,172.31.%d.1;netmask,255.255.255.0", |
| mic->id + 1); |
| |
