Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2255686imm; Mon, 28 May 2018 04:53:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrhTDixlIeUJE8B0ShBqXm2NrsW76D3i5QFOXFiKQSnpSyw/3WLyze7tOMLz801U+mleKKl X-Received: by 2002:a63:b046:: with SMTP id z6-v6mr10161369pgo.16.1527508414844; Mon, 28 May 2018 04:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527508414; cv=none; d=google.com; s=arc-20160816; b=DR/AtmyHeJzIr1mQGtpIFhLEBh6PZZwhX5Zw4R5cIFv3amvbYc2J2vQqyM4qkwweCb XNU1Alv/37YALuXMYJ4dtwAazv2wit0CQwowKpI6FPTqGlF/MdfnqHekbVHEzDRvCk7e oorsYWPnC6p1F1z88DE7fKMVK31zIoq02qTzVhGJtlYofPRgAGC9RD8neNmcD74Majqt UbNObZ6jwwL0cUXG6eqL1Q4NB3VAzK2tcVR7hEx4v3Qmj96tpD8dTk6+4rO7W7R+yAJr oZsvtYHfpn6DO0xRLF/JspzBoI6+ikOPkHP22yH6QoV+Bjn2V+/gPf9eRFExW6o3kxkd 87Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=PLUK5qKzwe+k5WE8wmF3Z0ddmpxlkI7UonoIRkKCmlk=; b=JXm2ktuBFbi1Wd5zAXLYtkhMKYASJ16oEbf5WnzU33cxUuPad2NtsbqjoBfn86WuKj mCyrJux/+irddZc8c+Dca09ClLqu/COpsntH6nhr3C7t44tI2fqE9fAB0uJzsQj9sNfW 26asyBtfWD1TBM6cbZJYc4G6QqRxDGmN3vbCZnKcV9vulTRRn/TMSFvu3VwdqNqB5mMs T6ryDPJ/AxQSvmS6Anl+DaAIJvjMDOfQJJmCruxKR6DBe/LAuxRm77KZhSfumf+O+dOu MZgdOA+FfBl48hneQo5lnR3V6SQRrlZR9/Nlsyg00a2wzN8y0xR8AYoAAzlpD3lxWooB OS+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X4AsfpK4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u59-v6si30029130plb.253.2018.05.28.04.53.20; Mon, 28 May 2018 04:53:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X4AsfpK4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424945AbeE1Lva (ORCPT + 99 others); Mon, 28 May 2018 07:51:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:57596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423466AbeE1LJh (ORCPT ); Mon, 28 May 2018 07:09:37 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D2C6208A3; Mon, 28 May 2018 11:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505777; bh=K+FDVCJSQ4GQncL4/DPzDORUCFwTHdm6jtwpCGZH1z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4AsfpK4F3qT7lOLY8aLoDlGiAFqckfd/+4U+sLxX23/yrK81AarZxtNallVRKTPj me8C0KjCqXhDF4TZIruQJu+hkuh67Np7IBsYJ/WM2zQcNDn9gAaPm9jfetSqKVkLtW WmvawME+J3dFpazx3pCw7/C4evO13Wrmk4c74ZBw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , "David S. Miller" , Sasha Levin Subject: [PATCH 4.16 125/272] net: qualcomm: rmnet: check for null ep to avoid null pointer dereference Date: Mon, 28 May 2018 12:02:38 +0200 Message-Id: <20180528100251.639539158@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100240.256525891@linuxfoundation.org> References: <20180528100240.256525891@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Colin Ian King [ Upstream commit 0c29ba1b43df1eb7d8beb03fc929d2dac4c15f7e ] The call to rmnet_get_endpoint can potentially return NULL so check for this to avoid any subsequent null pointer dereferences on a NULL ep. Detected by CoverityScan, CID#1465385 ("Dereference null return value") Fixes: 23790ef12082 ("net: qualcomm: rmnet: Allow to configure flags for existing devices") Signed-off-by: Colin Ian King Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -307,6 +307,8 @@ static int rmnet_changelink(struct net_d if (data[IFLA_VLAN_ID]) { mux_id = nla_get_u16(data[IFLA_VLAN_ID]); ep = rmnet_get_endpoint(port, priv->mux_id); + if (!ep) + return -ENODEV; hlist_del_init_rcu(&ep->hlnode); hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]);