Message ID | c6fb341d5eee85c602fa35b760903bf7505f704e.1487365317.git.pavel.belous@aquantia.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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 3vQ5Hs2rtKz9s85 for <patchwork-incoming@ozlabs.org>; Sat, 18 Feb 2017 08:09:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="ERwdLNlq"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935099AbdBQVJ0 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 17 Feb 2017 16:09:26 -0500 Received: from mail-sn1nam01on0062.outbound.protection.outlook.com ([104.47.32.62]:48096 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935088AbdBQVJV (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 17 Feb 2017 16:09:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=O+FX/gyAJao0PnEr0x4JxhRPp+7YhfY6QOE7yxhgxQI=; b=ERwdLNlq6VMFIRbvuRrIp9qpy+6IIWkVZpiuyHQdXK65q4WRAwaT1SuyH2LK3AdyIDAonFm8R0PEBHtNiNUBBwkdk9/BwJDGCCKH1i5hhlpllJaHnWNgPwcXYjrMV5klqkNyXhLrSQoXyTz8fE6PVM33wiYY1/pDDX3a7k3/uIY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; Received: from atltest07.rdc.aquantia.com (83.149.43.106) by BY2PR07MB534.namprd07.prod.outlook.com (10.141.218.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Fri, 17 Feb 2017 21:09:17 +0000 From: Pavel Belous <Pavel.Belous@aquantia.com> To: "David S . Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, Simon Edelhaus <Simon.Edelhaus@aquantia.com>, Alexey Andriyanov <Alexey.Andriyanov@aquantia.com>, Lino Sanfilippo <LinoSanfilippo@gmx.de>, Pavel Belous <pavel.belous@aquantia.com> Subject: [PATCH net-next v2 08/12] net: ethernet: aquantia: Null pointer check for aq_nic_ndev_alloc. Date: Sat, 18 Feb 2017 00:07:30 +0300 Message-Id: <c6fb341d5eee85c602fa35b760903bf7505f704e.1487365317.git.pavel.belous@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1487365317.git.pavel.belous@aquantia.com> References: <cover.1487365317.git.pavel.belous@aquantia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [83.149.43.106] X-ClientProxiedBy: DB6PR1001CA0023.EURPRD10.PROD.OUTLOOK.COM (10.171.79.33) To BY2PR07MB534.namprd07.prod.outlook.com (10.141.218.19) X-MS-Office365-Filtering-Correlation-Id: b256955f-b368-487d-7035-08d457793ce4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB534; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 3:BHB5Q1LBXsnGCH+/D2v2qgPw67du9S1VZnV6K2MoLd607CWGA5/fSeWYcKmHZa6u/ntUSZ5Jdd6qzB+eY/LS7mFujf1zlSzTJ0z2Iwu+EjtYY6sxP9CarbjX1gXck9VZfUj9ybhfipoazuTx+ytwO2x72OCe6tXEEejIXm0+SvvRxglijYS1mSPdxMcehHzARjKgKOxOOhbkYn5TXeA+Uq1Y7XBVcjTIDDE1zki9lYFS+dMH2AgP10fNi8oWkQhoI0sp01BFgs6xNVnBYvl/2g==; 25:V6YA/U21H6rL3rjcCEUMLc6R1SuRgXPiLAc4AKcYsjoefXwQ1iasapXUWAMdGIDK0p6/Otsw3oYAevs/5mEb6K8aNX03ChhIDyhkSAymEQLw1jB4GPaS6I8XFhcyQlxE8L7pnBhfKE8tMiTlntdoDMmi3BIMA1ZlLGgWtNsrqzzpMkIyOdhnlLn3bfznepr5emO84jnETBdVwq8Q/rz9UM9opNeaPlkT/56Ni6975GmFEm3YYK+VkZwFbYVaM1zgIeFGUHSXY/V51GkrJVOYwzrBgyYtvvPtMsjx1xVhCeKXW7pX1yLAz1EgQW+w3IwMCjrG6KDMM0vRh5uzuVFlJkfEI4AqO3CveOFtGLaKvIXl5lSpA4nEUEYWrg1pmGFUMo4QoArzlhwRU3yaOWyhkkDDIVPYWq6vdVtj/y0sygQT5bUgYapQvOoFU+Ikv3ayM5D85njr+R4tQOQ3eH4X/w== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 31:KtFSVy1IsxW8SwbTOMzD91z3bL42QqAs3+R+stw2E3rIUnKlD2wsR7O95eelEp9w9pXq+/9AW7D1PGrJUrV9IMsCf879VLQ3b4MyB7IWILEadtg6X4q8KRAvkcmdVD/CvyiULmR/pbtv+JUKiIqdn4jX7gf4YkOQP2AK5toG+hvWs6SB+9T4heHOkJD+7Q6RekmHYi4spCM4tXcmcNoq3x2Sgu2UnzWZMT2biTj20s8=; 20:pApqYoM1t/+4UlnhQtikd2Kbe2QutWlURyMnFeKdC+utJl3GNxKo0eQZlA0wf3DJvpYE87vdkcCy9HmkYwByQzBEaiRTLVDBAHAa9PxcnHHiijNZNTatOrL2WD7BS3bK4qR51VO9JrorPKmLtogTemfnumvCNh71hhe12j+5dvaGLrV4funRh6ckmISu3dtHPCKcXYen1I08Zr3BBGRH8xiZUB/+3MpaSG/gYX05z+p16WcEQFfKqePKg3m6FfRUdFzR0X6nv79j3wa34D8m9FA/dZmkqSfcJCPHWo8GurEWN7vfIX/8kNJBtOQ3Z3/jSfKcZZcvTit/8PcpyNHH+ceEptl4ZuVq548Mk3nzvAcP6L6poKH9cR1H0G+chPR72sKmJC3L06R5zNoFAqiQeRRM2f5hYh8QXK/IW/0dmMbdcPxRRb8jKBJFuNjT+BS0f3vyHlLFVFkgDrbez4ww/nHp69liP3cXdvji2/sy6OYzjqI44OA9eK0YQYq3e44g X-Microsoft-Antispam-PRVS: <BY2PR07MB53444CAE576BB297352646BE15D0@BY2PR07MB534.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:BY2PR07MB534; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB534; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 4:izSDcpZuJ/5Z3f6J3Lh98+Rt8re1sCTvnO1Di2zfeMKKC81YRtRYJlb/INFjX5Ad1h3o9EJySQf8rxgtIaMzaVR8/BT53monuHoqlcrBaibhOHywENe3Tm7y8XLZd5779kl3NQRPeKvzJ89jtFi6y3knGl/h7Qfd2IHKdz0edeJLBCu59649N8vBW+LhooV2SFFuRPEzOln7Bi1M1OahG8fapTzCEfH/WkHyYsxkrSpum2OW4c23q3n3fqqRK5DdOmM92EqZ5RSRs7ZNohF/zrMEQeCXUDyFXmQkQGWJ+8cKQld3v14dEN5/hLJA+X65nboIL/urJf9iKTdR9liXfNa75PmiVX2pYBHN8K1t+8FBlalqnBvlCt0H4spl9FCQ2o8qb365fxeLnyciRBsUtvWZc0BgLwLzIiwYNYVbVW5RqxJSvzRQzvyYxUE1i5ueRb/H+cPobTnFruC91ZpFE0FW9zKXSKy2N2yi5jjzI4I5bK2XsaNpel0w50rkL0iFpvFaK7+WJo3Ijz2ihUyuxwohn5yLeVMzjMfEkXucrggodRbOuNfi+eFVuwugCdDKPzOKm89B0wsG5I/WZQ30rKr6JYxmlECrJdAOvNdUTNY= X-Forefront-PRVS: 02213C82F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(8666007)(92566002)(6486002)(5660300001)(33646002)(54906002)(118296001)(50986999)(76176999)(101416001)(25786008)(106356001)(42186005)(86362001)(81156014)(81166006)(50226002)(8676002)(36756003)(47776003)(66066001)(105586002)(97736004)(305945005)(4326007)(189998001)(48376002)(5003940100001)(6666003)(7736002)(6916009)(68736007)(50466002)(2906002)(3846002)(6116002)(2950100002)(53936002)(38730400002)(110136004)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB534; H:atltest07.rdc.aquantia.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB534; 23:TipAetvZVrEL4PO/8W6XmieRKzZFetrhhEIMGwee2A?= =?us-ascii?Q?9dXlhB0Wh1zBbkq5JQIQ/ARj5yb0kVJItjIwL8YG3tekvlylHSms6Ic7IXq3?= =?us-ascii?Q?HRr/4uBVYJ0WincZ1VqMIiKgUYzkucPD9jDxWlA2Y8orS4ZCUr+Wl/Pu/ajA?= =?us-ascii?Q?98mtTQao3Tmh77PRM8wAcRPS2QY14f+zR4RT/L3co1LMKSjolk+Fl77lWkJ7?= =?us-ascii?Q?kQQgnhIT017XZb5DQfiPFwSr+YCJQkfm2nyxw+NMM9Io/ISYTThHDw9fqurY?= =?us-ascii?Q?ozMhwHlSoAuTl9vWbf6b5p+GlfXxP0g+FApJ3g90R+04v+KTrps0kqqfDXQ5?= =?us-ascii?Q?wJ84jAv6zc9bvl9A146L4NB5IPizVssC3TaTXGmSmqlhL2hdiHEcVMhaj/Ly?= =?us-ascii?Q?BxKvRrp4ZM1iLDX8ahBXOaBwD7psVTo21rGzi+rxYX3d35j6bspxg4OkAyK6?= =?us-ascii?Q?1Cn7vuvAiffsv6qm1O5iOYouiClpfTCdDwXJbp5FpMBeO9Ck+Aj5+q6Jge51?= =?us-ascii?Q?uNIQ7qCQH58nBv1L72iaU2D/rvEPsHJS6nhRWZ3Rr06BjaC6WP9f70C129IA?= =?us-ascii?Q?bmP7IilULMQ86X+HOHTfD9PFOz8T3ZYnLtR3c1YCMoJV9qVVBZHceBh51Ckm?= =?us-ascii?Q?kP/hDDPNJblIMBcVm5g4f3suWypw1cL8Rl3o6VSZ1+QM7BXdWj3gzNdXXCh+?= =?us-ascii?Q?taPA+ZcfSuIit5lY7mGt9prlGVeZemg+9NmQRU/cwHNmheHj2t9RrzMQGbFY?= =?us-ascii?Q?39BwIrQdkqAqk5uoPczGTRopjfQkXeIqwbKtFxHS8LXmSdjXPCPCl/7DqGrN?= =?us-ascii?Q?EjdY8GODndfKmuZ+oQrM4k+G0O3oENA8hK4ZZ361dNcrXJR/W1XYBl1TX32O?= =?us-ascii?Q?gqTBrML0HKS7kDU6B2HkNkqzP2FiYgM1aFDgX0sHQQQxUdUQiTgS5B+P/f1N?= =?us-ascii?Q?q964kWIIfVGfsqf1oFgDUeAZRejkibjipjloCwaGoS3cuNN5aO0qnxoKYLCr?= =?us-ascii?Q?KKEoI83SfoaYBJ0yVy46A6fV6txDp+PZq/+25xISkUPR/gE3KEroER6VIueA?= =?us-ascii?Q?3fiRYFtlGdTxMXak4QXO8/oLY1NjU4gLfJ2Q7hSQv4ZiPF/kz2ypgoAydhK4?= =?us-ascii?Q?mOS0gKytNuyTW2hg4Gx5fYvbYJP+3s?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 6:YVKe5fAhMpV1ZVDhDWNwubeEuqT9tNr8CGTk5Bd1vhOsxJfYdYjwE9cMfyOsE0gIsvG/LnKG0tUpjKIjmf9g+H99Wd0ociFeYbYPBUNVrHr+tZ0dxVbOYgza7rWyOwAXSX2cIgRAGp/wZwEQTMpfCjdMspCC8f2zOoJGE7YXRuEPV4Y1u5RsGbxJCjvq/3DueeaycbjhYR9IU2koIdMcjSCt0nsw1TQNTC3PnGH38xEvolljAPvqiGxVVaDEOSbjNMzodlAKypxJzJjM+/Xml/rS4rWuvKW/DXzFghtPg4Y9VRFq2txrC7d7tsxq4LvsB1Fg+E/mkEtGvDcUVRLj/VVgBBYyXXV5C15RPCOzEEBuj6Xs1FswNN4phqjM9Aguxmk/CaU0XpspFtL6YScLIw==; 5:lQ56+Mf3ef8n2UmONX+R+xbuh6o73xvNsS1rX4vNk0ZCUkBB5m95Vhbt2ES4tMocnijwI2Pb1HLZCOqyZfWb7YwocATxHuvracChdNTD+fdPla6OmsWV+7CGOD6KUlD80FLHxVfSWHnyW90Oq4AezQ==; 24:DOyVJD2Uz4HacWT47WToSaw2kLucM6SNoWl1P5AdFr0mG5tBbB+2ocnJQK6nmAUzK3uYddsUXqR461OJ8YxoqTIaFX7IxePomCMW5PsZTcE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB534; 7:JupYIrbFjMM+zT5g3uTMsgdlHE1zPto2GpD/GF0naY3609RC4ApWdRjAAhY1P/yq18IpRURmsbOBudNsvZsZxL4krJz4BPD6JeHrJqsS/lTzimdf+CBygXWc2uNlUM5OCCmbszzdUGEgA0balMCpWqx1XPrb3KC8WeDF6B8mDBok8bBuiMfS3bMFsB/FCC+WrbWwJxx9IoER3s3FqNf2IJ3W0PmLlBwX0fNX57SGtmzpp/37b3LPeto7CAV02uwFpYd4w2LVmfmys0DT5jCvD7/edmT4f35B78PXZsmyFHFXMDp8EORoc4vCyzPg3c3cV1+n0oasMeq0pB2RK5ylAQ== X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2017 21:09:17.3626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB534 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 4cf633c..e50fba2 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -202,12 +202,13 @@ struct aq_nic_s *aq_nic_alloc_cold(const struct net_device_ops *ndev_ops, int err = 0; ndev = aq_nic_ndev_alloc(); - self = netdev_priv(ndev); - if (!self) { - err = -EINVAL; + if (!ndev) { + err = -ENOMEM; goto err_exit; } + self = netdev_priv(ndev); + ndev->netdev_ops = ndev_ops; ndev->ethtool_ops = et_ops;