diff mbox

[v3] drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

Message ID 1284699944.2565.4.camel@dan
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Dan Rosenberg Sept. 17, 2010, 5:05 a.m. UTC
Now with descriptive title, as requested.

This was previously reported as a security issue due to leakage of
uninitialized stack memory.  Jeff Mahoney pointed out that this is
incorrect since the copied data is from a union (rather than a struct).
Therefore, this patch is only under consideration for the sake of
correctness, and is not security relevant. 

Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>







--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Sept. 17, 2010, 5:27 a.m. UTC | #1
From: Dan Rosenberg <drosenberg@vsecurity.com>
Date: Fri, 17 Sep 2010 01:05:44 -0400

> Now with descriptive title, as requested.
> 
> This was previously reported as a security issue due to leakage of
> uninitialized stack memory.  Jeff Mahoney pointed out that this is
> incorrect since the copied data is from a union (rather than a struct).
> Therefore, this patch is only under consideration for the sake of
> correctness, and is not security relevant. 
> 
> Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
> Acked-by: Grant Grundler <grundler@parisc-linux.org>

Tab et al. damaged by your email client.

This is getting tiring for me, I guess it's getting tiring for
you too? :-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet Sept. 17, 2010, 5:31 a.m. UTC | #2
Le vendredi 17 septembre 2010 à 01:05 -0400, Dan Rosenberg a écrit :
> Now with descriptive title, as requested.
> 
> This was previously reported as a security issue due to leakage of
> uninitialized stack memory.  Jeff Mahoney pointed out that this is
> incorrect since the copied data is from a union (rather than a struct).
> Therefore, this patch is only under consideration for the sake of
> correctness, and is not security relevant. 
> 
> Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
> Acked-by: Grant Grundler <grundler@parisc-linux.org>
> 
> --- linux-2.6.35.4.orig/drivers/net/tulip/de4x5.c       2010-08-26 19:47:12.000000000 -0400
> +++ linux-2.6.35.4/drivers/net/tulip/de4x5.c    2010-09-14 21:26:52.499474207 -0400
> @@ -5474,7 +5474,7 @@ de4x5_ioctl(struct net_device *dev, stru
>         tmp.lval[6] = inl(DE4X5_STRR); j+=4;
>         tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
>         ioc->len = j;
> -       if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
> +       if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
>         break;
>  
>  #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
> 


While you are at it

	if (copy_to_user(ioc->data, tmp.lval, ioc->len))
		return -EFAULT;

Thanks


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-2.6.35.4.orig/drivers/net/tulip/de4x5.c       2010-08-26 19:47:12.000000000 -0400
+++ linux-2.6.35.4/drivers/net/tulip/de4x5.c    2010-09-14 21:26:52.499474207 -0400
@@ -5474,7 +5474,7 @@  de4x5_ioctl(struct net_device *dev, stru
        tmp.lval[6] = inl(DE4X5_STRR); j+=4;
        tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
        ioc->len = j;
-       if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
+       if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
        break;
 
 #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */