From patchwork Mon Mar 11 07:06:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054174 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="cihfZ+Sq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Hpzv3bZtz9s47 for ; Mon, 11 Mar 2019 18:06:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726530AbfCKHGR (ORCPT ); Mon, 11 Mar 2019 03:06:17 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:43614 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725839AbfCKHGR (ORCPT ); Mon, 11 Mar 2019 03:06:17 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id E4093AF7 for ; Mon, 11 Mar 2019 07:06:15 +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 VTio1ZVJ9S2S for ; Mon, 11 Mar 2019 02:06:15 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (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 B9968AEF for ; Mon, 11 Mar 2019 02:06:15 -0500 (CDT) Received: by mail-io1-f70.google.com with SMTP id r21so2753007iod.12 for ; Mon, 11 Mar 2019 00:06:15 -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=bvO7v7oxdUe9xiXt3S678nHr/b8b0DJEbTnfoL/BRME=; b=cihfZ+SqY9xq0NaaxaYR8WyiVnCZstf6DcJBgxwndsqZS4NzWGLp1eg86VHMuut515 2bqSs4xqrl8AEz8XKKDLnXCNuwUklWkMoauXgDeVMOQo7JUiEgfdmdN+deJ2a0SEf3Pm KrXKiyDPjH0pk+WwDVj7/DGR5CyVrXgJwBkCiu97K/+b1mdnP+RcMJTs9LdpG+d21p3C cXr2bgPEhXXjXycaS2lWWuNwsKHLDlrC6aPQasNdgoVrNcBs+Jqsyb63yo7kMGQNVQdx gBYsCEZP5cf0PhL6qb5F7uKq/6y3RZqZsTe5c70TRbxkuU9N4EN9Rv3tXNuYJ/MgHeRL Uprg== 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=bvO7v7oxdUe9xiXt3S678nHr/b8b0DJEbTnfoL/BRME=; b=bL4Or2kTRzL3Q8y47p4xo1D67iom5SF/5y2yvGIJKLKCHkjrg3biqT51WmLAgcOaDn McOMPL1PWqC1g2Spmd4qpgQHu+UKF7gR6KKoTBgMsJ4u/c/B0aD+6GHGKm5mIonLvr6f Ar03pcDyUIVZg6sMxzv/hr/BrO4LTNEvSNQ8EjJa9QvTT0tojpYGg/CHKvKJB8+kvpnJ 1vuRwFXgBsTt7+8A73bU/gpNJxiLlJ8Lo6pqHa56RIIKeJVnpfoyPB3Lk/sWUHa5nxU4 RDJUw/F0QcUHeiTEucpd3QjuTSJKYD/RWNRf55a84fGEqBh0RAjTbRlekwAtehkLGAcI vrEQ== X-Gm-Message-State: APjAAAUFSYZJmUgs+05BskBrlmVA0DQNGqNhIDNlZEyhT234oGdpMEUY vAXk8dEaRbyHApgV6B8lszBdDzTn44wIORr+vZabUIqeDJy+7W8wQr1SvzSxuLL9UEI9O2+sCVz iRXnxK2O3CLY0i9Eg3Nxk X-Received: by 2002:a5d:8905:: with SMTP id b5mr17530813ion.241.1552287975343; Mon, 11 Mar 2019 00:06:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKaMEJ8r0XV+XO5t7XnDWfO48FKcHRqY1LJfmohesNx6d12OCvW4czkOpuSpfg0fbuhvjo+A== X-Received: by 2002:a5d:8905:: with SMTP id b5mr17530804ion.241.1552287975110; Mon, 11 Mar 2019 00:06:15 -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 s1sm1883981iob.32.2019.03.11.00.06.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 00:06:14 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Jiri Pirko , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: rocker: fix a potential NULL pointer dereference Date: Mon, 11 Mar 2019 02:06:06 -0500 Message-Id: <20190311070607.25859-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 kzalloc fails, the fix releases resources and returns NOTIFY_BAD to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/rocker/rocker_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index c883aa89b7ca..a71c900ca04f 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -2805,6 +2805,11 @@ static int rocker_switchdev_event(struct notifier_block *unused, memcpy(&switchdev_work->fdb_info, ptr, sizeof(switchdev_work->fdb_info)); switchdev_work->fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC); + if (unlikely(!switchdev_work->fdb_info.addr)) { + kfree(switchdev_work); + return NOTIFY_BAD; + } + ether_addr_copy((u8 *)switchdev_work->fdb_info.addr, fdb_info->addr); /* Take a reference on the rocker device */