From patchwork Fri Apr 21 21:20:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 753605 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 3w8pYg0Ylgz9s4s for ; Sat, 22 Apr 2017 07:20:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kb//jQGA"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422762AbdDUVUf (ORCPT ); Fri, 21 Apr 2017 17:20:35 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35340 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1041465AbdDUVUd (ORCPT ); Fri, 21 Apr 2017 17:20:33 -0400 Received: by mail-it0-f66.google.com with SMTP id e132so270390ite.2 for ; Fri, 21 Apr 2017 14:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=w+eRkCOMCg85PujZ0iXgF8/0IRyy2MvN+lhEqqC52BE=; b=kb//jQGAWRYSlep+nRpzOr5uVZG23fjv0ZK5nbHvhNyUNdsEOY+P+vSJqsxn3x15Tj J+BURlOE3XffQIbMiY6wK4UcbSx9/df88p1R8syuKN59NOSsmZX7eGHBc5LFa6T7vaHv /s5XviN7qyHGQ44UdVy6ZJR7Ypz2Xb//nuECJ/KilqEPS8oyukrjp9xsebtJ+4mDmvF3 B/pBcotbL/fUaEQhJQUk9XmnIjq024wYcPZXg8SZVJqrIw/0icO/Z+wmybJbpf1uSj/Z r216O8bhw7D3xrHLtuOyP3cOOSCv4N456RxzWE9CLCKsB1q6GxA//Uy06c4O6ajGtEus 5RfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=w+eRkCOMCg85PujZ0iXgF8/0IRyy2MvN+lhEqqC52BE=; b=MbnM3uRCUWiSmzCk595jNuml2p2SPdmHib0ccbK5jmqmH7BcaLv6FnXxShapTlhhgw AaK/3oBrC+FBP/cfinX7Kr2V6VLhKrEkuJ4GlPydP3Hf9y6gfXu2ZYUUOKCayq4TdV7o aumVx97dtVteweJTOurg1W2JwA4Cy7j0wuwCXMtbXp9/iXfQG9vbZ/FjdlGJk0kL9lbA ElLGZBNgOz085XCrG9zjaXIJTdfI8whHh5eg3oebJqPdnC8X91HwHpa1NVEx5nXur2Un 93ctsdXvKt38EQyWoWH2A2Sjxuj3gY+I4rJXcTkpMnYIEuTyNmCidtRUOK9mpBlMjXkA vIxw== X-Gm-Message-State: AN3rC/5medXV5lkV0bvn5viaARezsmtwyBZ1BUByhNWQ8OgDKZt5wfho eGkysCOr18ot1w== X-Received: by 10.99.122.12 with SMTP id v12mr14080841pgc.98.1492809632656; Fri, 21 Apr 2017 14:20:32 -0700 (PDT) Received: from f1.synalogic.ca (c-73-12-236-54.hsd1.ca.comcast.net. [73.12.236.54]) by smtp.gmail.com with ESMTPSA id u8sm17658609pfk.103.2017.04.21.14.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 14:20:31 -0700 (PDT) From: Benjamin Poirier To: Jeff Kirsher Cc: Stefan Priebe , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH 1/2] e1000e: Don't return uninitialized stats Date: Fri, 21 Apr 2017 14:20:11 -0700 Message-Id: <20170421212012.25950-1-bpoirier@suse.com> X-Mailer: git-send-email 2.12.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some statistics passed to ethtool are garbage because e1000e_get_stats64() doesn't write them, for example: tx_heartbeat_errors. This leaks kernel memory to userspace and confuses users. Do like ixgbe and use dev_get_stats() which first zeroes out rtnl_link_stats64. Reported-by: Stefan Priebe Signed-off-by: Benjamin Poirier --- drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 7aff68a4a4df..f117b90cdc2f 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -2063,7 +2063,7 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, pm_runtime_get_sync(netdev->dev.parent); - e1000e_get_stats64(netdev, &net_stats); + dev_get_stats(netdev, &net_stats); pm_runtime_put_sync(netdev->dev.parent);