diff options
Diffstat (limited to 'drivers/misc/ibmasm')
| -rw-r--r-- | drivers/misc/ibmasm/command.c | 6 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/ibmasmfs.c | 3 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c index b5df347c81b..6497872df52 100644 --- a/drivers/misc/ibmasm/command.c +++ b/drivers/misc/ibmasm/command.c | |||
| @@ -41,18 +41,16 @@ struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_s | |||
| 41 | if (buffer_size > IBMASM_CMD_MAX_BUFFER_SIZE) | 41 | if (buffer_size > IBMASM_CMD_MAX_BUFFER_SIZE) |
| 42 | return NULL; | 42 | return NULL; |
| 43 | 43 | ||
| 44 | cmd = kmalloc(sizeof(struct command), GFP_KERNEL); | 44 | cmd = kzalloc(sizeof(struct command), GFP_KERNEL); |
| 45 | if (cmd == NULL) | 45 | if (cmd == NULL) |
| 46 | return NULL; | 46 | return NULL; |
| 47 | 47 | ||
| 48 | memset(cmd, 0, sizeof(*cmd)); | ||
| 49 | 48 | ||
| 50 | cmd->buffer = kmalloc(buffer_size, GFP_KERNEL); | 49 | cmd->buffer = kzalloc(buffer_size, GFP_KERNEL); |
| 51 | if (cmd->buffer == NULL) { | 50 | if (cmd->buffer == NULL) { |
| 52 | kfree(cmd); | 51 | kfree(cmd); |
| 53 | return NULL; | 52 | return NULL; |
| 54 | } | 53 | } |
| 55 | memset(cmd->buffer, 0, buffer_size); | ||
| 56 | cmd->buffer_size = buffer_size; | 54 | cmd->buffer_size = buffer_size; |
| 57 | 55 | ||
| 58 | kobject_init(&cmd->kobj); | 56 | kobject_init(&cmd->kobj); |
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index eb7b073734b..22a7e8ba211 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
| @@ -563,11 +563,10 @@ static ssize_t remote_settings_file_write(struct file *file, const char __user * | |||
| 563 | if (*offset != 0) | 563 | if (*offset != 0) |
| 564 | return 0; | 564 | return 0; |
| 565 | 565 | ||
| 566 | buff = kmalloc (count + 1, GFP_KERNEL); | 566 | buff = kzalloc (count + 1, GFP_KERNEL); |
| 567 | if (!buff) | 567 | if (!buff) |
| 568 | return -ENOMEM; | 568 | return -ENOMEM; |
| 569 | 569 | ||
| 570 | memset(buff, 0x0, count + 1); | ||
| 571 | 570 | ||
| 572 | if (copy_from_user(buff, ubuff, count)) { | 571 | if (copy_from_user(buff, ubuff, count)) { |
| 573 | kfree(buff); | 572 | kfree(buff); |
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index fb03a853fac..4f9d4a9da98 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -77,13 +77,12 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi | |||
| 77 | /* vnc client won't work without bus-mastering */ | 77 | /* vnc client won't work without bus-mastering */ |
| 78 | pci_set_master(pdev); | 78 | pci_set_master(pdev); |
| 79 | 79 | ||
| 80 | sp = kmalloc(sizeof(struct service_processor), GFP_KERNEL); | 80 | sp = kzalloc(sizeof(struct service_processor), GFP_KERNEL); |
| 81 | if (sp == NULL) { | 81 | if (sp == NULL) { |
| 82 | dev_err(&pdev->dev, "Failed to allocate memory\n"); | 82 | dev_err(&pdev->dev, "Failed to allocate memory\n"); |
| 83 | result = -ENOMEM; | 83 | result = -ENOMEM; |
| 84 | goto error_kmalloc; | 84 | goto error_kmalloc; |
| 85 | } | 85 | } |
| 86 | memset(sp, 0, sizeof(struct service_processor)); | ||
| 87 | 86 | ||
| 88 | spin_lock_init(&sp->lock); | 87 | spin_lock_init(&sp->lock); |
| 89 | INIT_LIST_HEAD(&sp->command_queue); | 88 | INIT_LIST_HEAD(&sp->command_queue); |
