[PATCH 1/2] virtio-rng: cope if struct hwrng.name is changed to const

[PATCH 1/2] virtio-rng: cope if struct hwrng.name is changed to const

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]


Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/char/hw_random/virtio-rng.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Based on the current virtio tree in linux-next.

diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 12e242bbb0f5..6319b133b7aa 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -94,9 +94,11 @@ static int probe_common(struct virtio_device *vdev)
 {
 	int err, i;
 	struct virtrng_info *vi = NULL;
+	char *name;
 
 	vi = kmalloc(sizeof(struct virtrng_info), GFP_KERNEL);
-	vi->hwrng.name = kmalloc(40, GFP_KERNEL);
+	name = kmalloc(40, GFP_KERNEL);
+	vi->hwrng.name = name;
 	init_completion(&vi->have_data);
 
 	vi->hwrng.read = virtio_read;
@@ -117,7 +119,7 @@ static int probe_common(struct virtio_device *vdev)
 
 	i = 0;
 	do {
-		sprintf(vi->hwrng.name, "virtio_rng.%d", i++);
+		sprintf(name, "virtio_rng.%d", i++);
 		err = hwrng_register(&vi->hwrng);
 	} while (err == -EEXIST);
 
-- 
2.0.0.rc2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 2/2] virtio-rng: some small tidy ups around kmalloc

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]

Include slab.h for kmalloc/kfree declaration and check the actual
allocations succeed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/char/hw_random/virtio-rng.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 6319b133b7aa..73d7fc42d1a7 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -24,6 +24,7 @@
 #include <linux/virtio.h>
 #include <linux/virtio_rng.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 
 struct virtrng_info {
@@ -97,7 +98,13 @@ static int probe_common(struct virtio_device *vdev)
 	char *name;
 
 	vi = kmalloc(sizeof(struct virtrng_info), GFP_KERNEL);
+	if (!vi)
+		return -ENOMEM;
 	name = kmalloc(40, GFP_KERNEL);
+	if (!name) {
+		kfree(vi);
+		return -ENOMEM;
+	}
 	vi->hwrng.name = name;
 	init_completion(&vi->have_data);
 
-- 
2.0.0.rc2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/2] virtio-rng: cope if struct hwrng.name is changed to const

[Rusty Russell]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/char/hw_random/virtio-rng.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> Based on the current virtio tree in linux-next.

Actually, Sasha Levin did a nice cleanup which replaces these two,
and restores the const.

I've applied them, so you should have it in today's linux-next.

Thanks,
Rusty.

Re: [PATCH 1/2] virtio-rng: cope if struct hwrng.name is changed to const

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 654 bytes --]

Hi Rusty,

On Mon, 19 May 2014 09:30:53 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/char/hw_random/virtio-rng.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > Based on the current virtio tree in linux-next.
> 
> Actually, Sasha Levin did a nice cleanup which replaces these two,
> and restores the const.
> 
> I've applied them, so you should have it in today's linux-next.

Yep, saw that. Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]