mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
tty: vcc: Add check for kstrdup() in vcc_probe()
[ Upstream commit d81ffb87aaa75f842cd7aa57091810353755b3e6 ] Add check for the return value of kstrdup() and return the error, if it fails in order to avoid NULL pointer dereference. Signed-off-by: Yi Yang <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
This commit is contained in:
parent
35b9435123
commit
460284dfb1
1 changed files with 13 additions and 3 deletions
|
|
@ -587,18 +587,22 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
|
|||
return -ENOMEM;
|
||||
|
||||
name = kstrdup(dev_name(&vdev->dev), GFP_KERNEL);
|
||||
if (!name) {
|
||||
rv = -ENOMEM;
|
||||
goto free_port;
|
||||
}
|
||||
|
||||
rv = vio_driver_init(&port->vio, vdev, VDEV_CONSOLE_CON, vcc_versions,
|
||||
ARRAY_SIZE(vcc_versions), NULL, name);
|
||||
if (rv)
|
||||
goto free_port;
|
||||
goto free_name;
|
||||
|
||||
port->vio.debug = vcc_dbg_vio;
|
||||
vcc_ldc_cfg.debug = vcc_dbg_ldc;
|
||||
|
||||
rv = vio_ldc_alloc(&port->vio, &vcc_ldc_cfg, port);
|
||||
if (rv)
|
||||
goto free_port;
|
||||
goto free_name;
|
||||
|
||||
spin_lock_init(&port->lock);
|
||||
|
||||
|
|
@ -632,6 +636,11 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
|
|||
goto unreg_tty;
|
||||
}
|
||||
port->domain = kstrdup(domain, GFP_KERNEL);
|
||||
if (!port->domain) {
|
||||
rv = -ENOMEM;
|
||||
goto unreg_tty;
|
||||
}
|
||||
|
||||
|
||||
mdesc_release(hp);
|
||||
|
||||
|
|
@ -661,8 +670,9 @@ free_table:
|
|||
vcc_table_remove(port->index);
|
||||
free_ldc:
|
||||
vio_ldc_free(&port->vio);
|
||||
free_port:
|
||||
free_name:
|
||||
kfree(name);
|
||||
free_port:
|
||||
kfree(port);
|
||||
|
||||
return rv;
|
||||
|
|
|
|||
Loading…
Reference in a new issue