Message ID | 1f109726415ae5fc15a9836ba3586f26fe6b860b.1487618263.git.pavel.belous@aquantia.com |
---|---|
State | Accepted, 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 3vRv7162fcz9s72 for <patchwork-incoming@ozlabs.org>; Tue, 21 Feb 2017 06:38:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="rGqCX2om"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752318AbdBTTiE (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 20 Feb 2017 14:38:04 -0500 Received: from mail-bl2nam02on0068.outbound.protection.outlook.com ([104.47.38.68]:52795 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751478AbdBTTiB (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 20 Feb 2017 14:38:01 -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=yC3Tft8+0NTU9Owq74hJlsnCQjbHlBOnXs3iBv3kR9A=; b=rGqCX2om7TxKuF+PXkh1AFRbOCyuHskID8VeNOIsYYC8FEr7bpwEE/YFzY8EBEginvUOuOGF+8s65GZ4BIcSRRa7mu0W/PGKQZELRDr6rPNKKCBRPtQnGTZy5faxJQDhZwm9ddIqCzM6QK1egDeAoiXcuqQ6H/DTRZHZ3fv/KuI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; Received: from atltest07.rdc.aquantia.com (83.149.43.106) by BY2PR07MB2294.namprd07.prod.outlook.com (10.166.114.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Mon, 20 Feb 2017 19:37:49 +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 v4 08/12] net: ethernet: aquantia: Null pointer check for aq_nic_ndev_alloc. Date: Mon, 20 Feb 2017 22:36:46 +0300 Message-Id: <1f109726415ae5fc15a9836ba3586f26fe6b860b.1487618263.git.pavel.belous@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1487618263.git.pavel.belous@aquantia.com> References: <cover.1487618263.git.pavel.belous@aquantia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [83.149.43.106] X-ClientProxiedBy: VI1PR0901CA0074.eurprd09.prod.outlook.com (10.167.203.170) To BY2PR07MB2294.namprd07.prod.outlook.com (10.166.114.26) X-MS-Office365-Filtering-Correlation-Id: 94dae08c-7072-4b56-6bad-08d459c7f52e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB2294; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 3:BhMieELa4HGrIYm5Fhxg1aw8/p5YV2u8vykLiReus5MIYeR1myIT5gAjCHNjd7x30ukxkr0LvhdqJTPv3iD2h95Fl4mTTcwafGLXZweUbbiHk2UaXmv9gSN/R7mIrshz1czDKsraK88iMuGHxL1EgDwoMT5W9bq2/PQ1nUWV+wiJmxysE91dZwaOzvd5DG1jD9ueQe0XdpoaSMuQRXL5fe9jHPZ9cGK5Fw9F2kfV4Tg7i3+l/LrgahD1gIbm7INfLj+tCUsPZz+z7GLtcWAhmA==; 25:DIoBE3rb2rxaPAzaLeZhdB1SKlEriB8mGSUZ3IWfYhbB92L+FfMQaTQRl1r/VAzXaCY89yP8IlFFjLEJ9SXBnZ7ihk9DvlNNo8/V4nZoNFdr9UBwEVNuxj1dGB84ZVWtfB3JsVTVKBFjxU738h5KVToRB9MDU7gJorLObK5QGBP67wlNKD4STSewaeNCu96IyUNEY5zAmaiqGusbQoWIF7hBNYc/wcXspmvEpsnazO54qeaPUkGXztZMqRjjuSbL5iOuhcbBS70rHdDOqvwxp01Aj8ZrP+kXOJ9ljokUldrFC+rWgbI5qjtVBSiGNnzkKIt+jDCYqHXjCq3lMM9cLXiAUXqCKQqJVlavMEshB8lU9J+jF7/LRBgIii2DBrLU/1xEqg/e3F4N6xFg2RGW8fSfvgf9yLpz7nisRutz3iovSPz38Bmq5cl61O/0AQMfIuq7P0ZO+SZp/H/rMJxKSw== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 31:FzDCH802lJ+qeoCHS9wXNM/tQPe9uM22adONY3l7gEDbm+QZP3C1JZ95ethyUE6qGW5ElbwGeOS1lLrQPpnAB0P90btlkjeaRxeqyElctYAg5CtvCBqrMv93qTE775/ayxwwcCv1JeZW9UynzwfVWb+N+mjGzUg9k7PmbSE7LF3Du52y+G2LLuFgia+9BL9ihocwHS2xv3u4q46gbQz89zNM1zienTdBgC1/jdoMo3A=; 20:Bqh1W/1GGapKzTWLs47Nj4dazPEE55Lf5LeU6LDlcPmc3PV55empkutk7y9iBkPFYyZJbFpsW8tX/DU4j96cql/XkTEK7je9ZKjODv+ZosJWfO+ZvzAlYoBrl2ilCBarSrVez18tEhkNYfdZUJW4hpMwhxEnDxgDhROsuqtNo7eCA+YCaNb5cydcPccWRZo1ggcahhXy5uwBw0sFq3pbS+qqaCBkVREHLY6lS8my+6BCG9+h5wj0jkLDtsyk3ql6YYCSN/bNUtVfZJZXuGSkolh/FA4cAINnKZIMx3ZYeYlW3mjt5VMQytqnCTY/2alNRcXYpwUeiHS/bynn4dHW6yT/mRSsSPraDGmYZoaxbVEjda5AGHetmO0Mv5zJq92w6FL5rvNhrueE2DbWuhGd63ObOIJRnZkqCIgedQLLLUS2OYcxb5uamUB0fKLLBPTPGyv9ymnfrShD+fj35YTOYkJLNtL52Da40Fucn5qmft1VNAFE070CLJvLNk1x2Qyx X-Microsoft-Antispam-PRVS: <BY2PR07MB2294DF2F33E712FF33098D07E15E0@BY2PR07MB2294.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(26323138287068); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:BY2PR07MB2294; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB2294; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 4:U1w4tCKWWfmgPmvW9OMv0dBeFvspXLGwK553rCRse1jiXLzemD3Tik+JY/EkcDgWCbAF+jEu8ICGo87g/paaHd8WrX2aNAFjhiNlJ3C0mlztWrPYLJhVS/nrZv2B7nXTf7UI8gB7IO92UxbicZBsRe3wG17LK+bGOr2ZVYoOMwSBT6sXFO3iTVRO4vLbocQwuBsgbiehN4yjlUgKPu+k1gB6QRDUS+Rhq/oTdJozXJxIwaaJSZ+loRepHudn7QwXQdujh6eGHcPG0Z6w3XaV7tuM4Lv0uo61A2nVQ3HI0xaj2W67EZsHJfwzbgQcJLqcVEWt7ZyjXshkDvFvBi9f42gsEQh7OBq3o5ZvYUOcN2rBy0OHItdoX0CQLVEahz2AuspFEkfc5ZxFEUTr8KVI5S/MnY2aHUau25ueILiMNRcC6DBKjfBaCzsnVdEWrMBkuxJneN5EPFJXlREqhZPWKvhIquK9JynsqY9kgneQeHIpvtgasqxrXNj7PCea/PLldrgREOUr+SVnbIdgeCjQ/TEXJFlDPz1e/2Z+c9yFmNrMxGw+ioar+Z1+JjLWcU5DkEEq8J+OxcQng3WexUQUOD4nNF/glkwbY3Csha9fomBEECf2FVSSUT+LWThAw6r8TF9ARGTSx7Y8LgZzt3F1hw== X-Forefront-PRVS: 02243C58C6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(110136004)(38730400002)(107886003)(53936002)(81156014)(81166006)(5660300001)(101416001)(8676002)(97736004)(105586002)(76176999)(42186005)(50986999)(86362001)(118296001)(106356001)(189998001)(33646002)(36756003)(68736007)(66066001)(47776003)(6916009)(2950100002)(50226002)(6666003)(50466002)(7736002)(92566002)(6486002)(25786008)(8666007)(6116002)(3846002)(4326007)(305945005)(5003940100001)(2906002)(48376002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB2294; H:atltest07.rdc.aquantia.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; BY2PR07MB2294; 23:+HhimLqIXRa5iNpNNAXEdUztndJsHvBboWs2mKxNm?= =?us-ascii?Q?PxrCwZgzsw4iMPLuIEWF39qs7zhrPFcJgImeSOOEDgL6TxP7vaeRZe02ClDa?= =?us-ascii?Q?VyHVfy/lWyiTe6pKyKb1mTjj58c5JPM2eo6Uug7E2j/64ZkjkAii1FlgZ0kS?= =?us-ascii?Q?LWsG6eJEBieodVpSIefNpZT0JJyz8WvgST9P3bL9GMtbsrVaLAOx1gRAV9cx?= =?us-ascii?Q?q4pkvJNJ0WJVKNFnpHDNfa+jkDunpZSqxgfvSO6vSIavaLEI7uqJNsaQ1jiG?= =?us-ascii?Q?2MyC49sBY3i88ue5CnxnSthP/e3gkhR+V9niCFiA4LcUOzqyAmQw7jWCdYp5?= =?us-ascii?Q?JctBqLV1i5U0yaqzHuxBNiwiUD+OFqYg/dPXC1EQnvAgYu10Li7/RNJfEj5T?= =?us-ascii?Q?MuMoUVjjn6sP/iwrgcUYyYopVGPZHJjxN6aHrID9jiIDS0bl035GXx0ibw46?= =?us-ascii?Q?sFGipcZSdXR9ClEKqpJnrOzkqN5Z3kz3nYQfBS9To8gXd2qwstbRrag9NIUy?= =?us-ascii?Q?/V1JQr0m6+0d5GYr03ZCthY++azpXP5TqCyf1YsQtxafluFCFOKB7HGpm1KD?= =?us-ascii?Q?CHLtC8aYagmqaV2qoLZqZNC4cIJT+UYfvZXMZ5zLDRp1kE1B8LH/CNegtoBb?= =?us-ascii?Q?sbF3o+4CkQ6Pd/Bl0Bj8MH8CUnDMCPOlyPO1vUR6IrmJNz4HTwIGMSQQ+R5/?= =?us-ascii?Q?9HGV0SVlhcEdf2vd7skJ0T/7PIIEwI3rI+jmEJRQtMZsOQtgMFAk8fGZ+xL7?= =?us-ascii?Q?qKJMkXPwMaHx0Q2wONauEDv1GpZm0/dOHeLt4/TZkL9koW0xKZweG1vFPDtt?= =?us-ascii?Q?MDFEkGwbe+zyIAX+qyQovnLOJcUYEX7sa6q3h45ag2J3K1w31KIErbWlYlY9?= =?us-ascii?Q?0P449WpGlU6yBtq2SJUXZvDcdWh32We4ELCO+sNkeoTZSnPEr+wx56Qe74ek?= =?us-ascii?Q?q0rG99d0jt3GaV9PUluUSHkAznoemUbL6R/a40VtuMHuylWJzgPC6NtRLF+q?= =?us-ascii?Q?cbe0YjWmS7MG/JremTtaogLd9BaS4U6Z+MA+jVJyu5BLymJSajkwA9g4VeIt?= =?us-ascii?Q?20ENp/+ND8mi3DWzgL6qxsjJFlOmeQ+JgklOQMpT3LN9nqsPSUoKJwuz65Dd?= =?us-ascii?Q?1w4Cz89CSDNRCCTsoZ3Y2bApxlsUFPN?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 6:oeSz4T3gUrnDr4458sieA9o8fLQhLbJtiPNNWQYjZIVDbmuXyzgy4zD7WvPeWD8gKomQf7AaLjE1jJCfCfaPdbt0MbSLoq+HM0ERAyxFUjPvMcvpqCTQvqAY9scd0Z+04uZKq/GFWGeIFDuXvTSn4GuRcDtbq1HSWFBNfST65RCubZBWGRh2V25US8z02Fpt8G57gqu775SnSqAH16RGxHpnF3cVfayZsbBK9bdE5br8PKyyuBX0rOl96tgxZxXg17WZCqhRo/XETw/toyKXkrdvyjFe3ri0NCD07oLGImIhtOwEWHsnnSsmlVtpcXAsOWlxa7K2uj3AKJ8zRTsZ3TUtudQqjJViPmIE6bm/DnMRJIWtmtEuqFv6tQcy6TecpSgdtkGnYBbSve7AeZEJrA==; 5:AXiC7MaGc83tQIwzpb04G4nzZfaK/ePPa56lNCQFTLUM2Nqf3g9cSK9sGDb8H6OQoO57aVsH4Df0SeWERUqNv0f7sBfR37lWaCDWILAC1LwwixggyA7/DohIH3NHlrYvngzPHfi6jmeLVKnK2efnyg==; 24:FLcu3MGgdVGrLccJ2BBSsQMTKIphXN7aRRSPHqDl2Kjs0T8n26jDnJE13xlSbEnwznmnk1lZQHKBRjI1OIr9w7uqgIzICKBFZKI82nuyzmE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 7:O4TvR30xojrG1VN5mTmbFdU6SKeQgWANCXysrE7t9oHovEIWngFzZn2WDJgTiuZTkLT8hq8LdtiVko/WOoRSCz3JCUwQZ0VaTU6zFQFOhdaQissHxwvexdD5arWfpZzRj5H10fom5nP18KTGDwj8jBDDB1uk8cp57eKVJyy0fFM0SIpRzYkCZl4pAiO19jUq5EfCDK3GORp4qsD9vUZv7tNMR36cnyYjFSlAoLSsN1V6fikik07236tvfhZMahpQP8gKhm1I4UokoX8/RhDBGe4+fvbTMV9qHVqx0M+Xg3tEIy1LOEqvuNHmTnXuoYQiWCAz1KvJ8YvuoN09n7W+NQ== X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2017 19:37:49.4742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB2294 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 019bcc7..a8a27c5 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;