* [PATCH] s390: avoid format strings leaking into names
@ 2014-06-10 17:46 Kees Cook
2014-06-11 7:13 ` Heiko Carstens
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2014-06-10 17:46 UTC (permalink / raw)
To: linux-kernel
Cc: Martin Schwidefsky, Heiko Carstens, linux390, Ingo Tuchscherer,
Greg Kroah-Hartman, Kent Overstreet, Tejun Heo, Geoff Levand,
Stefan Weinhuber, linux-s390
This makes sure format strings can't accidentally leak into kernel
interface names.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
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(-)
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index ee0e85abe1fd..0f471750327e 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -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);
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index cf31d3321dab..a8848db7b09d 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -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;
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 5222ebe15705..0e18c5dcd91f 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -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)))
--
1.7.9.5
--
Kees Cook
Chrome OS Security
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s390: avoid format strings leaking into names
2014-06-10 17:46 [PATCH] s390: avoid format strings leaking into names Kees Cook
@ 2014-06-11 7:13 ` Heiko Carstens
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2014-06-11 7:13 UTC (permalink / raw)
To: Kees Cook
Cc: linux-kernel, Martin Schwidefsky, linux390, Ingo Tuchscherer,
Greg Kroah-Hartman, Kent Overstreet, Tejun Heo, Geoff Levand,
Stefan Weinhuber, linux-s390
On Tue, Jun 10, 2014 at 10:46:20AM -0700, Kees Cook wrote:
> This makes sure format strings can't accidentally leak into kernel
> interface names.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> 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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-11 7:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-10 17:46 [PATCH] s390: avoid format strings leaking into names Kees Cook
2014-06-11 7:13 ` Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox