diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-05-15 11:47:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 15:18:25 +0800 |
| commit | 284e7be895509cdaf9f58e2f789c00b5e9da2244 (patch) | |
| tree | ce07904bf2adce771798c3408c29d02ccdffc2f2 /drivers/tty | |
| parent | 4e799d5e79f04b8099c1bd2ff9dc047d3fefd2c1 (diff) | |
| download | linux-3.10-284e7be895509cdaf9f58e2f789c00b5e9da2244.tar.gz linux-3.10-284e7be895509cdaf9f58e2f789c00b5e9da2244.tar.bz2 linux-3.10-284e7be895509cdaf9f58e2f789c00b5e9da2244.zip | |
hvc_xen: NULL dereference on allocation failure
commit 201a52bea928687b7557728b176ac4f8a37d5cbd upstream.
If kzalloc() returns a NULL here, we pass a NULL to
xencons_disconnect_backend() which will cause an Oops.
Also I removed the __GFP_ZERO while I was at it since kzalloc() implies
__GFP_ZERO.
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 83d5c88e716..d3d91dae065 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -430,9 +430,9 @@ static int __devinit xencons_probe(struct xenbus_device *dev, if (devid == 0) return -ENODEV; - info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); + info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL); if (!info) - goto error_nomem; + return -ENOMEM; dev_set_drvdata(&dev->dev, info); info->xbdev = dev; info->vtermno = xenbus_devid_to_vtermno(devid); |