Skip to contentSkip to conversation

drivers/net/tulip/de4x5.c

PATCH In review Dan Rosenberg 4 participants 10 messages Sep 15, 2010 – Sep 17, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers/net/tulip/de4x5.c

Fixed formatting (tabs and line breaks).

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.

drivers/net/tulip/de4x5.c +1 -1
@@ -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 */
maintainer
#1 lore raw

From: Dan Rosenberg <[email protected]>
Date: Wed, 15 Sep 2010 17:43:18 -0400

Quoted 10 lines

Fixed formatting (tabs and line breaks).

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.

You need to give something more descriptive than just the name of the file you're editing in the Subject: line of this commit message.

Otherwise people scanning "shortlog" and similar output won't have even a general idea of what kind of change your commit is making.

Please formally resubmit this with a proper commit header line.

#2 lore raw

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

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.

drivers/net/tulip/de4x5.c 2010-09-14 21:26:52.499474207 -0400 renamed from drivers/net/tulip/de4x5.c 2010-08-26 19:47:12.000000000 -0400 +1 -1
@@ -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 */
maintainer
#3 lore raw

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

From: Dan Rosenberg <[email protected]>
Date: Fri, 17 Sep 2010 01:05:44 -0400

Quoted 10 lines

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.

Tab et al. damaged by your email client.

This is getting tiring for me, I guess it's getting tiring for you too? :-)

#4 lore raw

PATCH v4 1/1 drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

Tiring doesn't begin to describe it. Formatting undamaged.

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.

drivers/net/tulip/de4x5.c +1 -1
@@ -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 */
maintainer Applied
#5 lore raw

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

From: Dan Rosenberg <[email protected]>
Date: Fri, 17 Sep 2010 01:30:36 -0400

Quoted 1 line

Tiring doesn't begin to describe it. Formatting undamaged.

:-) Thanks.

Quoted 8 lines

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.

Applied.

#6 lore raw

Re: [Security] [PATCH v4] drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

Quoted 13 lines · David Miller

From: Dan Rosenberg <[email protected]>
Date: Fri, 17 Sep 2010 01:30:36 -0400

Quoted 1 line

Tiring doesn't begin to describe it. Formatting undamaged.

:-) Thanks.

Quoted 6 lines

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.

Quoted 4 lines
Quoted 2 lines

Applied.

David, just for the record, as was already reported on the list, this fix is finally more a cleanup than a security fix because "tmp" is a union and not a struct, so tmp.addr == tmp.lval.

Regards,
Willy

#7 lore raw

Re: [Security] [PATCH v4] drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

Quoted 14 lines · Willy Tarreau
Quoted 13 lines · David Miller

From: Dan Rosenberg <[email protected]>
Date: Fri, 17 Sep 2010 01:30:36 -0400

Quoted 1 line

Tiring doesn't begin to describe it. Formatting undamaged.

:-) Thanks.

Quoted 6 lines

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.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Applied.

David, just for the record, as was already reported on the list, this fix is finally more a cleanup than a security fix because "tmp" is a union and not a struct, so tmp.addr == tmp.lval.

sorry, that was already explained in the commit message, next time I'll read it fully before replying :-(

Willy

maintainer
#8 lore raw

Re: [Security] [PATCH v4] drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

In reply to Willy Tarreau

From: Willy Tarreau <[email protected]>
Date: Fri, 17 Sep 2010 08:36:02 +0200

Quoted 14 lines · David Miller
Quoted 13 lines

From: Dan Rosenberg <[email protected]>
Date: Fri, 17 Sep 2010 01:30:36 -0400

Quoted 1 line

Tiring doesn't begin to describe it. Formatting undamaged.

:-) Thanks.

Quoted 6 lines

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.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Applied.

David, just for the record, as was already reported on the list, this fix is finally more a cleanup than a security fix because "tmp" is a union and not a struct, so tmp.addr == tmp.lval.

I can read, thanks :-)

That's why I applied it to net-next-2.6 and not net-2.6

#9 lore raw

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

In reply to Dan Rosenberg
Quoted 15 lines · Dan Rosenberg

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.

drivers/net/tulip/de4x5.c 2010-09-14 21:26:52.499474207 -0400 de4x5_ioctl(struct net_device *dev, stru · line 5480

Quoted 8 lines
drivers/net/tulip/de4x5.c 2010-09-14 21:26:52.499474207 -0400 renamed from drivers/net/tulip/de4x5.c 2010-08-26 19:47:12.000000000 -0400 +1 -1
@@ -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