Skip to contentSkip to conversation

s390: avoid format strings leaking into names

PATCH Applied Kees Cook 2 participants 2 messages Jun 10, 2014 – Jun 11, 2014

Subsystems (2)
s390 s390 zcrypt and pkey driver and AP bus
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 s390: avoid format strings leaking into names

This makes sure format strings can't accidentally leak into kernel interface names.

Signed-off-by Kees Cook <[email protected]>
---
 drivers/s390/block/dcssblk.c     |    2 +-
 drivers/s390/char/vmlogrdr.c     |    2 +-
 drivers/s390/crypto/zcrypt_api.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/s390/block/dcssblk.c +1 -1
index ee0e85abe1fd..0f471750327e 100644
@@ -593,7 +593,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
 	dev_info->start = dcssblk_find_lowest_addr(dev_info);
 	dev_info->end = dcssblk_find_highest_addr(dev_info);
 
-	dev_set_name(&dev_info->dev, dev_info->segment_name);
+	dev_set_name(&dev_info->dev, "%s", dev_info->segment_name);
 	dev_info->dev.release = dcssblk_release_segment;
 	dev_info->dev.groups = dcssblk_dev_attr_groups;
 	INIT_LIST_HEAD(&dev_info->lh);
drivers/s390/char/vmlogrdr.c +1 -1
index cf31d3321dab..a8848db7b09d 100644
@@ -761,7 +761,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
 
 	dev = kzalloc(sizeof(struct device), GFP_KERNEL);
 	if (dev) {
-		dev_set_name(dev, priv->internal_name);
+		dev_set_name(dev, "%s", priv->internal_name);
 		dev->bus = &iucv_bus;
 		dev->parent = iucv_root;
 		dev->driver = &vmlogrdr_driver;
drivers/s390/crypto/zcrypt_api.c +1 -1
index 5222ebe15705..0e18c5dcd91f 100644
@@ -356,7 +356,7 @@ struct zcrypt_ops *zcrypt_msgtype_request(unsigned char *name, int variant)
 
 	zops = __ops_lookup(name, variant);
 	if (!zops) {
-		request_module(name);
+		request_module("%s", name);
 		zops = __ops_lookup(name, variant);
 	}
 	if ((!zops) || (!try_module_get(zops->owner)))
Signature · 6 lines
1.7.9.5


-- 
Kees Cook
Chrome OS Security
Applied
#1 lore raw
Quoted 9 lines · Kees Cook

This makes sure format strings can't accidentally leak into kernel interface names.

Signed-off-by Kees Cook <[email protected]>
---
 drivers/s390/block/dcssblk.c     |    2 +-
 drivers/s390/char/vmlogrdr.c     |    2 +-
 drivers/s390/crypto/zcrypt_api.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks!