s390: avoid format strings leaking into names

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Kees Cook and committed by

Martin Schwidefsky 11 years ago ef283688 0eb69a0c

+3 -3

3 changed files

expand all

drivers

s390

block

dcssblk.c

char

vmlogrdr.c

crypto

zcrypt_api.c

+1 -1

drivers/s390/block/dcssblk.c

··· 593 593 dev_info->start = dcssblk_find_lowest_addr(dev_info); 594 594 dev_info->end = dcssblk_find_highest_addr(dev_info); 595 595 596 - dev_set_name(&dev_info->dev, dev_info->segment_name); 596 + dev_set_name(&dev_info->dev, "%s", dev_info->segment_name); 597 597 dev_info->dev.release = dcssblk_release_segment; 598 598 dev_info->dev.groups = dcssblk_dev_attr_groups; 599 599 INIT_LIST_HEAD(&dev_info->lh);

+1 -1

drivers/s390/char/vmlogrdr.c

··· 761 761 762 762 dev = kzalloc(sizeof(struct device), GFP_KERNEL); 763 763 if (dev) { 764 - dev_set_name(dev, priv->internal_name); 764 + dev_set_name(dev, "%s", priv->internal_name); 765 765 dev->bus = &iucv_bus; 766 766 dev->parent = iucv_root; 767 767 dev->driver = &vmlogrdr_driver;

+1 -1

drivers/s390/crypto/zcrypt_api.c

··· 356 356 357 357 zops = __ops_lookup(name, variant); 358 358 if (!zops) { 359 - request_module(name); 359 + request_module("%s", name); 360 360 zops = __ops_lookup(name, variant); 361 361 } 362 362 if ((!zops) || (!try_module_get(zops->owner)))