From patchwork Fri May 4 17:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 908896 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40czSd4jDdz9s35 for ; Sat, 5 May 2018 03:26:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721AbeEDRZj (ORCPT ); Fri, 4 May 2018 13:25:39 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:40464 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbeEDRZi (ORCPT ); Fri, 4 May 2018 13:25:38 -0400 Received: by mail-pf0-f193.google.com with SMTP id f189so17935582pfa.7 for ; Fri, 04 May 2018 10:25:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SGJb5X+xz/hPDQf4S/e/mqX757jXqtj0F6tOUvWab8g=; b=CHBSsoTV+cQHsfzViL+qPf1k+MCge8SraY0CuFnOZgdUG5VPvG/G/cUB+X36FrpSjn 24fiwQLu7NOxbVaqaZl5YjeEfXSRnz/Y/qmM8512R0dCbXnLPeLtHIjJrc35yQWpzggS zkKVz2oFdlL/Xkk55TKhSa8NhLOXcs2QyvHX/Wl8hOA+6/C6CrSDWu3FnjqhhUobMFCK hzUDLhg9XHV8ZJh82cqhZT4paTUFQsVuh2KxK1qWUrL8MggnHvi1AlEZWlrTMaeVvCzz +63PacEK+EFvbZDPZaqAZLzpI6issBSo+bcfF2i7SoOFUKo0UD8JBhKAbdmynmgEpdQb vbmQ== X-Gm-Message-State: ALQs6tDxhN9ICme73YGjNc9cTgsVUmcAjZ3Stc1Fgo09NN2VUlJB8Zkc KJoRV3cioQVc/X7RRhxUzp3PRg== X-Google-Smtp-Source: AB8JxZrLgQD7c4HCUSW73yTrQ4GaiW8QaHIC7ugE7sWB7hShe+iid99KBPMQnUS9PbmSTrSnSbd6Jg== X-Received: by 2002:a17:902:b483:: with SMTP id y3-v6mr28162211plr.157.1525454737394; Fri, 04 May 2018 10:25:37 -0700 (PDT) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id d23sm4150349pfn.3.2018.05.04.10.25.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 May 2018 10:25:36 -0700 (PDT) From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, davem@davemloft.net, alex.williams@ni.com, Moritz Fischer Subject: [PATCH 1/2] net: nixge: Fix error path for obtaining mac address Date: Fri, 4 May 2018 10:18:33 -0700 Message-Id: <20180504171834.9365-1-mdf@kernel.org> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix issue where nixge_get_nvmem_address() returns a non-NULL return value on a failed nvmem_cell_get() that causes an invalid access when error value encoded in pointer is dereferenced. Furthermore ensure that buffer allocated by nvmem_cell_read() actually gets kfreed() if the function succeeds. Fixes commit 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") Reported-by: Alex Williams Signed-off-by: Moritz Fischer --- drivers/net/ethernet/ni/nixge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 27364b7572fc..c41fea9253e3 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -1170,7 +1170,7 @@ static void *nixge_get_nvmem_address(struct device *dev) cell = nvmem_cell_get(dev, "address"); if (IS_ERR(cell)) - return cell; + return NULL; mac = nvmem_cell_read(cell, &cell_size); nvmem_cell_put(cell); @@ -1202,10 +1202,12 @@ static int nixge_probe(struct platform_device *pdev) ndev->max_mtu = NIXGE_JUMBO_MTU; mac_addr = nixge_get_nvmem_address(&pdev->dev); - if (mac_addr && is_valid_ether_addr(mac_addr)) + if (mac_addr && is_valid_ether_addr(mac_addr)) { ether_addr_copy(ndev->dev_addr, mac_addr); - else + kfree(mac_addr); + } else { eth_hw_addr_random(ndev); + } priv = netdev_priv(ndev); priv->ndev = ndev; From patchwork Fri May 4 17:18:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 908895 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40czSM4n7pz9s35 for ; Sat, 5 May 2018 03:25:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751775AbeEDRZm (ORCPT ); Fri, 4 May 2018 13:25:42 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33201 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751644AbeEDRZk (ORCPT ); Fri, 4 May 2018 13:25:40 -0400 Received: by mail-pf0-f193.google.com with SMTP id f20so9150495pfn.0 for ; Fri, 04 May 2018 10:25:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nDYwSnb9V7TgNlxR82TQUVuIuVcfrN1Z4IubhuGh7Xk=; b=gmh0xJ7zPfjiIvBbMDxvrG1LGEwICH2vh7yz5ie39nYvCnI4sSG9vtQUyav1xrXHEW 6LY1LFF7Gbx/Tj7C1/mBLj5oWqVr2M4GU3l7fWrAELHQXwPZT4L7lL1X/qaUTiAE3ddA xGThkrqRdOnS0uwHHD9rU2Y6Ag6QRsgfvdvLopkKB7eRgAavxacdUWlF/uO8OFZN4tTq EALThc6ik446hbCc/Fb9ABvjw0WJqKT9ULEnyrde3c8O5Kg84nSpx93NhZMc7YCQR7lK ikO5+eMRTyRRs3gLu4GR2/xq7ocB9nJruWYCqoCGYtK+lRswf2zIFA9okZ4NMrksfq2H weOg== X-Gm-Message-State: ALQs6tDrGzS7KZHwlz9H2We/V0QBrcU4SBH9BElUd5xLL9ECzWqInaSk mIkcKNUC/VdT3Jrhb2G9TxTgUK04sdc= X-Google-Smtp-Source: AB8JxZoe+nlnguxhq4bWZkX28iV+5vRl+NdlnLx0jW1E2mzoolFE5j5U5pFAQeF2egY4rW9M2MrgvQ== X-Received: by 2002:a63:7046:: with SMTP id a6-v6mr23586152pgn.358.1525454739519; Fri, 04 May 2018 10:25:39 -0700 (PDT) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id e87sm43798908pfl.65.2018.05.04.10.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 May 2018 10:25:38 -0700 (PDT) From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, davem@davemloft.net, alex.williams@ni.com, Moritz Fischer Subject: [PATCH 2/2] net: nixge: Address compiler warnings about signedness Date: Fri, 4 May 2018 10:18:34 -0700 Message-Id: <20180504171834.9365-2-mdf@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504171834.9365-1-mdf@kernel.org> References: <20180504171834.9365-1-mdf@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes the following warnings: warning: pointer targets in passing argument 1 of ‘is_valid_ether_addr’ differ in signedness [-Wpointer-sign] if (mac_addr && is_valid_ether_addr(mac_addr)) { ^~~~~~~~ expected ‘const u8 * {aka const unsigned char *}’ but argument is of type ‘const char *’ static inline bool is_valid_ether_addr(const u8 *addr) ^~~~~~~~~~~~~~~~~~~ warning: pointer targets in passing argument 2 of ‘ether_addr_copy’ differ in signedness [-Wpointer-sign] ether_addr_copy(ndev->dev_addr, mac_addr); ^~~~~~~~ expected ‘const u8 * {aka const unsigned char *}’ but argument is of type ‘const char *’ static inline void ether_addr_copy(u8 *dst, const u8 *src) Signed-off-by: Moritz Fischer --- drivers/net/ethernet/ni/nixge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index c41fea9253e3..b092894dd128 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -1183,7 +1183,7 @@ static int nixge_probe(struct platform_device *pdev) struct nixge_priv *priv; struct net_device *ndev; struct resource *dmares; - const char *mac_addr; + const u8 *mac_addr; int err; ndev = alloc_etherdev(sizeof(*priv));