mmc: core: use sysfs_emit() instead of sprintf()
PATCH 1/1 mmc: core: use sysfs_emit() instead of sprintf()
sprintf() (still used in the MMC core for the sysfs output) is vulnerable to the buffer overflow. Use the new-fangled sysfs_emit() instead.
Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
---
This patch is against the 'next' branch of Ulf Hansson's 'mmc.git' repo.
drivers/mmc/core/bus.c | 8 ++++---- drivers/mmc/core/bus.h | 3 ++- drivers/mmc/core/mmc.c | 16 ++++++++-------- drivers/mmc/core/sd.c | 22 ++++++++++------------ drivers/mmc/core/sdio.c | 4 ++-- drivers/mmc/core/sdio_bus.c | 6 +++--- 6 files changed, 29 insertions(+), 30 deletions(-)
drivers/mmc/core/bus.c +4 -4
@@ -34,13 +34,13 @@ static ssize_t type_show(struct device *switch (card->type) {case MMC_TYPE_MMC : -return sprintf (buf,"MMC\n" ); +return sysfs_emit (buf,"MMC\n" );case MMC_TYPE_SD : -return sprintf (buf,"SD\n" ); +return sysfs_emit (buf,"SD\n" );case MMC_TYPE_SDIO : -return sprintf (buf,"SDIO\n" ); +return sysfs_emit (buf,"SDIO\n" );case MMC_TYPE_SD_COMBO : -return sprintf (buf,"SDcombo\n" ); +return sysfs_emit (buf,"SDcombo\n" );default :return -EFAULT ; }
drivers/mmc/core/bus.h +2 -1
@@ -9,6 +9,7 @@#define _MMC_CORE_BUS_H#include <linux/device.h> +#include <linux/sysfs.h> struct mmc_host ;struct mmc_card ;
@@ -17,7 +18,7 @@ struct mmc_card; static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct mmc_card *card = mmc_dev_to_card(dev); \ - return sprintf(buf, fmt, args); \ + return sysfs_emit(buf, fmt, args); \ } \ static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
drivers/mmc/core/mmc.c +8 -8
@@ -11,6 +11,7 @@#include <linux/of.h> #include <linux/slab.h> #include <linux/stat.h> +#include <linux/sysfs.h> #include <linux/pm_runtime.h> #include <linux/mmc/host.h>
@@ -812,12 +813,11 @@ static ssize_t mmc_fwrev_show(struct dev {struct mmc_card *card =mmc_dev_to_card (dev); -if (card->ext_csd.rev <7 ) { -return sprintf (buf,"0x%x\n" , card->cid.fwrev); - }else { -return sprintf (buf,"0x%*phN\n" ,MMC_FIRMWARE_LEN , - card->ext_csd.fwrev); - } +if (card->ext_csd.rev <7 ) +return sysfs_emit (buf,"0x%x\n" , card->cid.fwrev); +else +return sysfs_emit (buf,"0x%*phN\n" ,MMC_FIRMWARE_LEN , + card->ext_csd.fwrev); } static DEVICE_ATTR(fwrev, S_IRUGO, mmc_fwrev_show, NULL);
@@ -830,10 +830,10 @@ static ssize_t mmc_dsr_show(struct devicstruct mmc_host *host = card->host;if (card->csd.dsr_imp && host->dsr_req) -return sprintf (buf,"0x%x\n" , host->dsr); +return sysfs_emit (buf,"0x%x\n" , host->dsr);else /* return default DSR value */ -return sprintf (buf,"0x%x\n" ,0x404 ); +return sysfs_emit (buf,"0x%x\n" ,0x404 ); } static DEVICE_ATTR(dsr, S_IRUGO, mmc_dsr_show, NULL);
drivers/mmc/core/sd.c +10 -12
@@ -708,18 +708,16 @@ MMC_DEV_ATTR(ocr, "0x%08x\n", card->ocr)MMC_DEV_ATTR (rca,"0x%04x\n" , card->rca); -static ssize_t mmc_dsr_show (struct device *dev, -struct device_attribute *attr, -char *buf) +static ssize_t mmc_dsr_show (struct device *dev,struct device_attribute *attr, +char *buf) { -struct mmc_card *card =mmc_dev_to_card (dev); -struct mmc_host *host = card->host; +struct mmc_card *card =mmc_dev_to_card (dev); +struct mmc_host *host = card->host; -if (card->csd.dsr_imp && host->dsr_req) -return sprintf (buf,"0x%x\n" , host->dsr); -else -/* return default DSR value */ -return sprintf (buf,"0x%x\n" ,0x404 ); +if (card->csd.dsr_imp && host->dsr_req) +return sysfs_emit (buf,"0x%x\n" , host->dsr); +/* return default DSR value */ +return sysfs_emit (buf,"0x%x\n" ,0x404 ); } static DEVICE_ATTR(dsr, S_IRUGO, mmc_dsr_show, NULL);
@@ -735,9 +733,9 @@ static ssize_t info##num##_show(struct d \if (num > card->num_info) \return -ENODATA ; \ -if (!card->info[num-1 ][0 ]) \ +if (!card->info[num -1 ][0 ]) \return 0 ; \ -return sprintf (buf,"%s\n" , card->info[num-1 ]); \ +return sysfs_emit (buf,"%s\n" , card->info[num -1 ]); \ } \ static DEVICE_ATTR_RO(info##num)
drivers/mmc/core/sdio.c +2 -2
@@ -40,9 +40,9 @@ static ssize_t info##num##_show(struct d \if (num > card->num_info) \return -ENODATA ; \ -if (!card->info[num-1 ][0 ]) \ +if (!card->info[num -1 ][0 ]) \return 0 ; \ -return sprintf (buf,"%s\n" , card->info[num-1 ]); \ +return sysfs_emit (buf,"%s\n" , card->info[num -1 ]); \ } \ static DEVICE_ATTR_RO(info##num)
drivers/mmc/core/sdio_bus.c +3 -3
@@ -35,7 +35,7 @@ field##_show(struct device *dev, structstruct sdio_func *func; \ \ func =dev_to_sdio_func (dev); \ -return sprintf (buf, format_string, args); \ +return sysfs_emit (buf, format_string, args); \ } \static DEVICE_ATTR_RO (field)
@@ -52,9 +52,9 @@ static ssize_t info##num##_show(struct d \if (num > func->num_info) \return -ENODATA ; \ -if (!func->info[num-1 ][0 ]) \ +if (!func->info[num -1 ][0 ]) \return 0 ; \ -return sprintf (buf,"%s\n" , func->info[num-1 ]); \ +return sysfs_emit (buf,"%s\n" , func->info[num -1 ]); \ } \ static DEVICE_ATTR_RO(info##num)
Quoted 11 lines · Sergey Shtylyov
sprintf()(still used in the MMC core for the sysfs output) is vulnerable to the buffer overflow. Use the new-fangledsysfs_emit()instead.Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
Signed-off-by Sergey Shtylyov <[email protected]>---
This patch is against the 'next' branch of Ulf Hansson's 'mmc.git' repo.
Quoted 7 lines
drivers/mmc/core/bus.c | 8 ++++---- drivers/mmc/core/bus.h | 3 ++- drivers/mmc/core/mmc.c | 16 ++++++++-------- drivers/mmc/core/sd.c | 22 ++++++++++------------ drivers/mmc/core/sdio.c | 4 ++-- drivers/mmc/core/sdio_bus.c | 6 +++--- 6 files changed, 29 insertions(+), 30 deletions(-)
[...]
Mhm... I forgot to #include <linux/sysfs.h> in some files -- they build
without it but better safe than sorry... :-)
MBR, Sergey