From patchwork Wed Sep 15 21:43:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Rosenberg X-Patchwork-Id: 64912 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4990B6EFF for ; Thu, 16 Sep 2010 07:50:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755291Ab0IOVtm (ORCPT ); Wed, 15 Sep 2010 17:49:42 -0400 Received: from mx1.vsecurity.com ([209.67.252.12]:54459 "EHLO mx1.vsecurity.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755275Ab0IOVtl (ORCPT ); Wed, 15 Sep 2010 17:49:41 -0400 Received: (qmail 53647 invoked from network); 15 Sep 2010 21:42:39 -0000 Received: from unknown (HELO [138.16.110.183]) (drosenbe@[138.16.110.183]) (envelope-sender ) by mx1.vsecurity.com (qmail-ldap-1.03) with SMTP for ; 15 Sep 2010 21:42:39 -0000 Subject: [PATCH v2] drivers/net/tulip/de4x5.c From: Dan Rosenberg To: grundler@parisc-linux.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, kyle@mcmartin.ca, davem@davemloft.net, jeffm@suse.com, security@kernel.org Date: Wed, 15 Sep 2010 17:43:18 -0400 Message-ID: <1284586998.6275.94.camel@dan> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Signed-off-by: Dan Rosenberg Acked-by: Grant Grundler --- 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 --- 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 */