From patchwork Mon Mar 11 06:33:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054161 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=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="osfwyC+O"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44HpGr0qmYz9s4V for ; Mon, 11 Mar 2019 17:34:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726471AbfCKGeC (ORCPT ); Mon, 11 Mar 2019 02:34:02 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:38088 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725850AbfCKGeB (ORCPT ); Mon, 11 Mar 2019 02:34:01 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 5062AA16 for ; Mon, 11 Mar 2019 06:34:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9RlowSo5ytII for ; Mon, 11 Mar 2019 01:34:00 -0500 (CDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 20DE79ED for ; Mon, 11 Mar 2019 01:34:00 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id v3so3496040iol.3 for ; Sun, 10 Mar 2019 23:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=HC/jRjq2phMSTGGfJQP8OUUC/tIZ0jS+Ie8QCGCbJJI=; b=osfwyC+OhFdcJQ+zllgvpJo6IXVSuwBO3tCffNA00sHPH1xyrKHnzSF2tPjLfS7xci +FZTFDjDbPfPS9zvpI7qo2zY9zL9XaAewhDYO7wGOX/91FA8Rai9I/bLIBTputhe2DWB 30mK6boCHHfxVQnvrNT3G2rZ1jarFcD/Ym+K2inHxjjDNkZjsOpmn4GULLz83lDItYAv fMHoVJR1YmMocGfNAbxaKvv26vOLrhtAPT/pgmDXL+yWTRjOiZwXu+xANJZ0jp34MKR0 H3dUIyiv3X5PdoCiwrhgEZHib1YxLlcC7/9Fdtqp6jJLAb53SJbyJvDiW30MzQw57dgg rbaQ== 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=HC/jRjq2phMSTGGfJQP8OUUC/tIZ0jS+Ie8QCGCbJJI=; b=ojR3N/UmPqYlv+t7qnWMxO93UkKXybvdoi2S61aTrGdMEM6ZYZiwjc7i3lqxrUQoL9 glRGUl5kXe8OrkX/oFIHXWVmFauqjey7llJEKAq1iuAmp5/sAx2pPLjIHtVb8fHkHl48 Vl8Gec8E21A0Nj4F5SaCmaF6X+H2enB1gGllkFlJL5jPKRI8Tv2lzmbkc5r8ugv2DM/u eNPkqmYbEF1l3m+G4FIJ3rk1Acoxor1bmdUcmoU0pD+feYV5WWBLIR9f8tmiLZauZDeW aJhcFLM6ukjWl6+iOWBPdXCCL4D6u5F8b9jmJOHNZVMUwgHo8F3atyWPxy/ahsy90yMu 4JQg== X-Gm-Message-State: APjAAAVaI0eirZqfnLi6XlpMLPNZWGCj8R92mciLo49YL4yAOEfwg/5m dUsgkMw0ZlSINM8nNAYqIl7lZ3ylWiOh1AFzNA+iXfeyCyMLdU4dkdSQ6057JwqlqDkwqZRhlKR wdi9gxGRholI4owoiBKVY X-Received: by 2002:a5d:88c1:: with SMTP id i1mr14782586iol.50.1552286039699; Sun, 10 Mar 2019 23:33:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzr/Rg1zh4+eFaHfHbyRmVOCARD9GFSy4CPROBMLP2f45wOEt2PgBJj/YeY75Oi4O+z2qCmXA== X-Received: by 2002:a5d:88c1:: with SMTP id i1mr14782578iol.50.1552286039428; Sun, 10 Mar 2019 23:33:59 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id u196sm9342507itu.34.2019.03.10.23.33.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 23:33:58 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Saeed Mahameed , Leon Romanovsky , "David S. Miller" , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: mlx5: fix a potential NULL pointer dereference Date: Mon, 11 Mar 2019 01:33:43 -0500 Message-Id: <20190311063343.20188-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case skb_header_pointer fails, the fix issues a warning. A better fix requires modifying the signature of mlx5e_get_fcs to pass an error code upstream. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index be396e5e4e39..6ec1c110e4be 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -719,6 +719,8 @@ static u32 mlx5e_get_fcs(const struct sk_buff *skb) fcs_bytes = skb_header_pointer(skb, skb->len - ETH_FCS_LEN, ETH_FCS_LEN, &_fcs_bytes); + if (unlikely(!fcs_bytes)) + pr_warn_once("skb_header_pointer returns NULL\n"); return __get_unaligned_cpu32(fcs_bytes); }