From patchwork Thu Jun 14 11:18:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 164918 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 7E8561007D1 for ; Thu, 14 Jun 2012 21:27:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753487Ab2FNL1c (ORCPT ); Thu, 14 Jun 2012 07:27:32 -0400 Received: from zimbra.vipri.net ([89.207.250.15]:41381 "EHLO zimbra.vipri.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826Ab2FNL1b (ORCPT ); Thu, 14 Jun 2012 07:27:31 -0400 X-Greylist: delayed 519 seconds by postgrey-1.27 at vger.kernel.org; Thu, 14 Jun 2012 07:27:31 EDT Received: from localhost (localhost [127.0.0.1]) by zimbra.vipri.net (Postfix) with ESMTP id D912D10002B7; Thu, 14 Jun 2012 13:18:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.vipri.net Received: from zimbra.vipri.net ([127.0.0.1]) by localhost (zimbra.vipri.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RKX5-y6TXzmF; Thu, 14 Jun 2012 13:18:49 +0200 (CEST) Received: from phil.computerman.de (host-089-207-255-234.vipri.net [89.207.255.234]) by zimbra.vipri.net (Postfix) with ESMTPSA id 7494A10002B3; Thu, 14 Jun 2012 13:18:49 +0200 (CEST) From: Phil Sutter To: netdev@vger.kernel.org Cc: davem@davemloft.net Subject: [PATCH] usbnet: sanitise overlong driver information strings Date: Thu, 14 Jun 2012 13:18:42 +0200 Message-Id: <1339672722-22793-1-git-send-email-phil.sutter@viprinet.com> X-Mailer: git-send-email 1.7.8.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As seen on smsc75xx, driver_info->description being longer than 32 characters messes up 'ethtool -i' output. Signed-off-by: Phil Sutter --- drivers/net/usb/usbnet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 9f58330..d4f7256 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -876,9 +876,9 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info) { struct usbnet *dev = netdev_priv(net); - strncpy (info->driver, dev->driver_name, sizeof info->driver); - strncpy (info->version, DRIVER_VERSION, sizeof info->version); - strncpy (info->fw_version, dev->driver_info->description, + strlcpy (info->driver, dev->driver_name, sizeof info->driver); + strlcpy (info->version, DRIVER_VERSION, sizeof info->version); + strlcpy (info->fw_version, dev->driver_info->description, sizeof info->fw_version); usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info); }