Message ID | 20170207201058.GA8962@felix.cavium.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 3vHxKJ6Fmvz9s2Q for <patchwork-incoming@ozlabs.org>; Wed, 8 Feb 2017 07:49:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="fMkW049I"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754417AbdBGUtU (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Tue, 7 Feb 2017 15:49:20 -0500 Received: from mail-bn3nam01on0072.outbound.protection.outlook.com ([104.47.33.72]:47744 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753259AbdBGUtT (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 7 Feb 2017 15:49:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DvMwCb04WhCt6hrgP9jQCeohRuIZaI6WLMjiw+0jWnM=; b=fMkW049I+vY9IXhF/raST9WQuKLZ+eD27XA9nmBqZ1vy8Fr4z8nHkMlDLNfXc9yVhFMER0LaQjo+EtIpD7Kil2XcuU47mJEoebckCyF+jCCoImq3B27iMf7gHIHIOeKde3n+/Ssn/LlNXtI2s+f15Ya7mxDvgiKUsZYQBFbMtu0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (73.71.186.126) by MWHPR07MB3183.namprd07.prod.outlook.com (10.172.96.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Tue, 7 Feb 2017 20:12:11 +0000 Date: Tue, 7 Feb 2017 12:10:58 -0800 From: Felix Manlunas <felix.manlunas@cavium.com> To: <davem@davemloft.net> CC: <netdev@vger.kernel.org>, <raghu.vatsavayi@cavium.com>, <derek.chickles@cavium.com>, <satananda.burla@cavium.com>, <dan.carpenter@oracle.com> Subject: [PATCH net-next] liquidio: do not dereference pointer if it's NULL Message-ID: <20170207201058.GA8962@felix.cavium.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [73.71.186.126] X-ClientProxiedBy: BN6PR17CA0023.namprd17.prod.outlook.com (10.173.147.33) To MWHPR07MB3183.namprd07.prod.outlook.com (10.172.96.141) X-MS-Office365-Filtering-Correlation-Id: 3cc325bf-8f6f-45b1-5b16-08d44f959a16 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR07MB3183; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3183; 3:uux+y+jqaUYYDhwWC7Q3XS1KQyNLDML5pq/fHXTbVOeOyuf2tkloF8aIZyWVzacDqQFRQJFoO1OI9iaxRzX6Y5XAMXjR6w01YUyHrfUu7NSVFGamhBCm8cdBLnlS/yyJikOZxf1vY0j4DbuyVQ7QcLty18vBBBFXtGwJYPNNA+QJ3YCoMpE9JKvyAvRXnwYKBMVUJ6Dw/FlRv+GeIJ+Tm89alFsyEPqfgIcoM3O9HTM5XO7NRMUavX7xTKC6wWlrn9sU9Apfen8M1EgDFiTAWg==; 25:UigBDh6I1T698UhYJ5JU8kl1fQk5frrGHLpHr1SqAsEFAn8RnXF/rVMF52ynSREGMtFunioyK5+UJQXN1NDB1kGvGqAKD0brq57sjrwn2jsAO35QjGNGAthVpE8lf/BpEY6JqN92w0OkAF58AeT9L1FlSHLv20aNw6IPOnFTeqaEVkCcusIhbwWh6JvAq9RBvOBA5Wkg83XqxncG3wgP4Kuba+ANbS3FtKoHsRnZNlhYaLOP/FV8M9JR6Vg5tbOpPI8v6aMxIzLl5+6rKB2pe8NUAInA+zpoixskCYGFp7eVYeu8RsHmebRGfpW+e2CebLVgOk50A/XaDOL4MVSLBWncGKowMC72ECNIewOk6duWLiDJ7ZGBS+8naGss5tUf/z75PV6dD7YSNkfHtppPn1sqKOKLccHsfh1FUevv6IsScees5E3QgVLwyU2pYpEJXzUQfCNePm+BS7EdSDza8Q== X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3183; 31:3bB1V6KRBh3V15Ut3F7MInci5f/4LmjA92A4vRUVOs143N60AOPsxFETzPgypxQtx9i6rG3/5QGx60Dz8xFXygQ/euBUiVmYDYweHxruCRa8NX5a0MPOVYrTDr1i31LEH/C8A2Iwwj9fVvbsGRuLz1nGXxYtLC0yN5sVTMVlPfroWLmCdvF0ZbsE1P9IiP0fPC2YXV36yZYOUEY0fX+h5p1KJxvY8oIbQD7MpIs1d6tjtwElvkhCpK6R71JffqTw; 20:RUYmIt5kYg+rtWpku2aUNA/K88yYyNU12Q8jKZYJpT7i+KJZiBjyVr7GbgGEtUa+pTPXWNKPt2hYgYVIFtOYg6Bw3mqby8cdVncGUplO1nU7GUL3Fpn47ZGTM1mIwNAP2PvK2yZIfbXpPiAlp/qKDT51Z4XZVcjMSuF8YpCcS8iGRjmD9s8RQuu7H8RLL1CVrEfzlshK69+mJ5/Xtvx7qLa8AMz+SqgZQFhUz62HzTcpUuHuZii2+gyNvR3fPnYjOr8p9IzbJDbnsZMuu3Wau/mude/yAhSdweUdb1eGb4sFrxb3yLdCIWXqkBwxnGP9YPbT8X4QQzLXYyb+FAxmwY0a1Ws+ubygoCQceFbzqHQioNUi7ssp3jkRsiMOSeEGk0KTgYuK9HrKmlfbAJ79AQfmHkrjQQbWJDCgSDJIUpCSTJCyGs0Bd/7e9BUmd0HpJoPeFASJ8u+wSqH8Wa128WV3PbvkeBBmbh4Ifk3LqYSb49mXO5fbvHKna2GOe9UN X-Microsoft-Antispam-PRVS: <MWHPR07MB31834EF13F7D82D2D76C02F0E7430@MWHPR07MB3183.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(2017020603029)(8121501046)(5005006)(20170203043)(10201501046)(3002001)(6041248)(20161123560025)(20161123562025)(20161123564025)(20161123555025)(20161123558025)(6072148); SRVR:MWHPR07MB3183; BCL:0; PCL:0; RULEID:; SRVR:MWHPR07MB3183; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3183; 4:ihErlk5SzV8OdunSRafubiraSwUGF6W/U2flUhtelzDbcFt+IkXbKdUJuy3ugiWomjEoWykTY19ZeD3QpVfiI/YnEji4zLeUKYSPSUDcNeOtoMtHYlYz1oYLqioZppkFt8JYtZCV8/Bt0rNgdAFEuIuq9Q1vMbWESiJT5sxA2tX/HesIZfl1CtjYb9PVR96qgA40A7mznlF6lRLoybOWwLZJOXowY+toRrm329bu/QMvcTbpp6/lKDmGY2bT5UWV+rwZIQa41BaHAZZL4UOlxa7GyA4T/KN4+70SP4QZIH+8crhdUiVc5Ed/t+JqPNwdUl8gdmV821k99tg/fFoCiKHFXHYPCf3/Icp2CyNHIJkL/CV9zDX4IMzhrqhNBJrLNXCdtd5JAK2+A+FRr+7HMaOwMd4cYoN+cwIf2NlRuzyH9vZZ9PL3B8L1gOBRjeIV/TMGp/mB/Cb7xhzFXr9kAqjzGzqVnZc60OkY/ShT2Rv17Ar/zzTGi14jBoL5uUiUb1824flNr7phk71vu9yfmkGu8U5nxLsGXCTzvlthX45CzcCqT0w87mFxmKExx4gqk196bUvY2JUVaZQyv1kkhx/Tgd1mj8vp1KR1FRAGizYgvJAJJtjrtqTezEoCcAMeLzJTVOhMCQWYJXDbY26u+higlm1LUhAJ/PfK0hmOaMB4w4hI84G+VAnGFkcgka7AAcSmWiD4oX7AUE0UCgqLBw== X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(209900001)(199003)(189002)(81166006)(8676002)(81156014)(97736004)(189998001)(305945005)(7736002)(68736007)(6666003)(66066001)(97756001)(83506001)(4001350100001)(53376002)(110136004)(38730400002)(575784001)(86362001)(92566002)(5660300001)(76506005)(25786008)(50986999)(101416001)(966004)(54906002)(47776003)(2351001)(6306002)(42186005)(106356001)(53936002)(105586002)(6496005)(6486002)(6116002)(50466002)(3846002)(23726003)(4326007)(1076002)(54356999)(2906002)(46406003)(33656002)(6916009)(18370500001)(129325002)(6606295002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3183; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR07MB3183; 23:ebxnTGDPViS47XzEgnJ1C2PJge71ibrzZND3qC3x8?= =?us-ascii?Q?wu8MHDppdujnhJLjyidj/ggcc95zLdgDw3gzJTzlWcD+G8cmL/rYqFwo1GmJ?= =?us-ascii?Q?6TmuMkOGADayA+OSTBYdju9Grhig12ogHJ7kuh9xCBvc2IQRqqOOd/GYld6D?= =?us-ascii?Q?lByTG50Hr5Rzpxfb/Iwd24OxfaY4oKhKiqw7fmfrUQioOhDRHHJWCz+9hGgt?= =?us-ascii?Q?7uFnMkAFwMlzqowexsJLYFZFj+G19YE4PW3S6AYl2HX9/UMsJ30rdlWex2ND?= =?us-ascii?Q?bpSVacmuUFDA+w6JuJXpLSIYSpz5DAJChBICee/kSuk7/ZVw3X58JvevzF55?= =?us-ascii?Q?CDV67Gw1Nz2d+LXQmAU/ErGuuXZePxiBSJSPPF4B1V06FJI0RFPCzxzBu1mh?= =?us-ascii?Q?EMam061Jo/ZHnWXRkyYsZI/aLsl63io47+eRyY0Eq4nSeOmeHk4h6m5GlQdk?= =?us-ascii?Q?1ivdJJ9dhmzIjKBIGTVxVreQZgB8+7RhtN7SFFsoMoF3tnyQx4B453FTbaAE?= =?us-ascii?Q?f+PHRvX6Ee7KHQMKyEC9qN33a4UR1XyKIQjmNg/tz7LAsRi990duuP1E27mW?= =?us-ascii?Q?CjrHfrV2QA7+rqpgDNTheHjYAMoiYSjd0gyy5glIMhPxBoxhFyWA3v3/1JjQ?= =?us-ascii?Q?fz05YhQ9cNVq/oxJFfaJEQ6toJ/C/EsdrWt8WMSZjnm6dy+yqShpLB6/sW0S?= =?us-ascii?Q?q/zgBZPpihRTWEj7JMXOXPZTJLrk12qF/H8Ezentcqrw9l02fQbd2b9MtcwO?= =?us-ascii?Q?DRXE+XUiV3LxNf9YsoN3wu9cUO19Y/ANSpGnYideJcpCAj9uBxoAznHjUutR?= =?us-ascii?Q?Oy+bYjX52PxZ/FmTvLdKD3Ndu25Pm+rzjyZzGAj0wwbKkPNMr+hkmvjZwuZn?= =?us-ascii?Q?tcNdztoRWuq9UYjRKd86JAd1p8ikM6MsDZNGmUJrp4h2dBFGZnxscoxTJWbH?= =?us-ascii?Q?zUsQgbaRVJ9kaUcaGaKnalD88mEpL0VzQFryBeq8CNkIgALM7gRACgljS4PB?= =?us-ascii?Q?0lxmLa8fte7Rz54W9SErqZdAhgR79xWbXjULKkxsguKPWXbeP6K1VL8/rf1i?= =?us-ascii?Q?ACxrb0rHAVXW1WtBw3BhLUVA7cMT0EKog7+6qg5P3KM8vsoBeYDAnjyyvN0/?= =?us-ascii?Q?QhpSE59F7FxBpstEYXATzgxiiByBdhTOI4cXEiiWxsm7aDMy5RuuQRrXS3Pr?= =?us-ascii?Q?YQ+uQ+DqWD3/U4d9D+cvb3yP4Bp8sRgKruPSxFzbZwh9dHnd7s0SvZgi0Gg1?= =?us-ascii?Q?Q4UcWeFVyNL1kZaS/45fUrDjTptjxPXGNOoOG+ZPiX5O9lZdrxGlB0+o6HxH?= =?us-ascii?Q?z6HRL2v28N3fjWOQ5mPRRuLSg178sh/W/ZfIwcntcuL+GPN5BR11t/X+g4uS?= =?us-ascii?Q?XSbqw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3183; 6:PI/xpyn69u2IkiLNbgBWWxoUvHN/DtGjO6g7jydbz2M9Tb6WZY1pweWB/nV4LRxNdwFkUhQkeJXjdvDFPMjZ1IpIozLlcrI7MEgabZ6vd8HYCBquMoAxEsrtckM4UKZmAt8Q/2zG2ow1D4FFb3G93XODPkHwF7h41V4b4U4RBp3qimKJkDm0weSCuU/g6w+mxk9GTFtnXjIBqKopTRAq1A8em+roaFzQk92r7E8jynVVtHYDpmslfHugXwKbfRZsoqJypYHvq3W02MHWWhSNMn5FoFtNYZXbiTeemfV55GjX4IZv2WUcFnk1oUalvYMinLNf8GpCp8s5I9jQfhYmU0m+C4l8k9Q9+ZzWa6OHP350QgVxiv+Cw7VeRTDPEDRztWphZ3H+EqxArVb082WywQ==; 5:0985wh+C6llJVnW5e83Lnt0nZVEaIsqAZZzjVZQ5xMyg2YsTaZIkhlQEk5MvO1z07j8YDp2rjIKN/hXLy99FpzP2L/me6zxLA55oYQoYveOGm7FXFk8YCo3BB8gEhMnb6q7Dy5D6ZNVoQE+8sV+o7PpwejWL6hPormrzeYzdRe0=; 24:/Vh12a8A9CwoU5CeZds3b8dFhKtVqKJFIys4hlVYVZA9XerVuzyJowjoUGI6eGWXNwqN77FXhbQK+MbId9Q8GgYFs2d8K64Sl+lCzyP7nf4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3183; 7:V0yVhWo4/ziHlXhO2ndo8P5Cn9ETpRiZV4nyrsIK9MtKLx7OmKEJDSs539LG/ningPrPeCbVkuqxpcHgjlCq95fTx4Vr+EoASpONkxpcFJXkyo2BextZeo2OAr1RIgP0Neez2w3BOgeP7FlPAwpuDOLCTKIs4auYirCHV/pa5jQUhfYgMyWDTFhNjyZulkJRnjdyd6luEHoC50PHfgIrbox4Cuvui3Gn+2phtzGc5x8C/8uEaXHpvdsl/eOk8Ltfig5R8Nhv/mkIYhmS9+iFYgjw+BwDOpBKSmtzYhdzjPld1mZtiDa6CyiqhSJmp4bnBpuzidUf1AJFLYx30b9mbiHHu7bFoc5wvjUNEoHU3QcE41BZGhe74Yqmqo7O8GriMl2Gv+s7OpNaTEUYsvtJK5EjP1Bj3ePY5Uvg2pbT5qrfIK6m8MEeetlcJZto6n0fzXJyh92C8sPRnKi8DwtG1cGUIGbqat3WCSiXmQYDaRFBkMRe+ZtTGdiPKmM4pG5LVHKBDGHar2toMJrTYXP7Aw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 20:12:11.6407 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3183 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/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index c12cfa4..a3c7b99 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2447,7 +2447,7 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) /* force enable interrupt if reg cnts are high to avoid wraparound */ if ((work_done < budget && tx_done) || - (iq->pkt_in_done >= MAX_REG_CNT) || + (iq && iq->pkt_in_done >= MAX_REG_CNT) || (droq->pkt_count >= MAX_REG_CNT)) { tx_done = 1; napi_complete_done(napi, work_done); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 631f1c0f..0536cb9 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1632,7 +1632,7 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) /* force enable interrupt if reg cnts are high to avoid wraparound */ if ((work_done < budget && tx_done) || - (iq->pkt_in_done >= MAX_REG_CNT) || + (iq && iq->pkt_in_done >= MAX_REG_CNT) || (droq->pkt_count >= MAX_REG_CNT)) { tx_done = 1; napi_complete_done(napi, work_done);
Fix smatch errors by not dereferencing iq pointer if it's NULL. See http://marc.info/?l=kernel-janitors&m=148637299004834&w=2 Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com> --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)