From patchwork Sun Jul 31 11:14:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 654348 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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 3s2Kck03qhz9sXx for ; Sun, 31 Jul 2016 21:15:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350AbcGaLOk (ORCPT ); Sun, 31 Jul 2016 07:14:40 -0400 Received: from mout.gmx.net ([212.227.15.15]:63061 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbcGaLOg (ORCPT ); Sun, 31 Jul 2016 07:14:36 -0400 Received: from LT002.fritz.box ([109.91.48.91]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0Lz3rc-1bGQcP3dE8-014Bbc; Sun, 31 Jul 2016 13:14:29 +0200 From: Heinrich Schuchardt To: Zhao Qiang Cc: linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heinrich Schuchardt Subject: [PATCH 1/1] wan/fsl_ucc_hdlc: avoid possible NULL pointer dereference Date: Sun, 31 Jul 2016 13:14:23 +0200 Message-Id: <1469963663-3005-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.8.1 X-Provags-ID: V03:K0:QHCYJuiDwAHpvz/hSgxM8BIIOEeeyvvwxDc0Ftui4uj6ODltysR tncLQUjFgaF1ezvtKmFEuyddq6hhE/X9Reo8xWhOIomHm30KA8riCNYn4z72yKJMqNFhboi XQRf9x8mYTWgn+6qpP/Zw6UVJKvR54hSBCxiFvnc/oi8xl6wDtJym0/Qn/oJqGmo73AlHlU 1CUJnCste3PvZHZzZYQew== X-UI-Out-Filterresults: notjunk:1; V01:K0:+dcJSmONVGw=:nM/wC4p4SCLV8EpBqpHtTX wmE5DJtJzFPW9DdkYqvPIqPaFL8CZsTG8qjNOnZQS4cWrOmgYcVTOj5XYM3SBoxm4jR21gbG+ ps7ROdoEiuFxeuyTQTAz92DmQEioeBGoSa6WR6bw/phLmLOwgE9tvulcvubO+b87mj7meonuY ycinUI2vlK9E8bui45k0QykkXIumSirPHf5sYG5eaenfV6IPN7x3h/2KCa/v5La+Uqk+u1Fcn sOJqzCXozV6V4RljB/KOtIn8WvAMqdRsdqGMBkglMiKGiE9BKkEIwQoSf2mQ12xL3Se65L5su mPFei1l8jD8HvbvBvFat9UY9AvHNu0iSZUmi7l/9f/HpssKeoIPtd6HNyT343r1jJJStqxRO4 mqVxr98AXsCXkVfSHqBMOChXf9R0bk/WBzDinzHKopLojAocwzTjSs/0ZriTptq8nFiH7EGLK iCh2izRJQJRs6uTPz9ZLEbFH9v9OjIjK+Rq+G228BJ/mpW6UXco/DmfqRfv+4Y62Polvp/Wwy 4tN2sVqnfcls6Ul8m5XjQuwKCwn05o2/w5/WPhpu7jRh/W7v/T/kNCicmsDNW3qB101JS/CBZ Sr8evSmOajzb7VEjMijyay9H39yG0jd5zJJMOq7qBIOyYT6iod0h/WoggfIzCoCGoRenUNEOW vLpIdYKNQUd8hXQYGPor3pNv170YMUlVhPDRAVo8c/60FUZeeRq4DzwXuohP0YH0hDOF93xLv j2t4zjI/a3gdTXef+CXh1H+b5VpOEhXhUEnhn0lLnRnwMUhq86jJ+OVJ47E= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org All assignments to components of priv should only occur after the check if prif is NULL. Signed-off-by: Heinrich Schuchardt --- drivers/net/wan/fsl_ucc_hdlc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 2fc50ec..6f04445 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -862,7 +862,7 @@ static int uhdlc_suspend(struct device *dev) static int uhdlc_resume(struct device *dev) { struct ucc_hdlc_private *priv = dev_get_drvdata(dev); - struct ucc_tdm *utdm = priv->utdm; + struct ucc_tdm *utdm; struct ucc_tdm_info *ut_info; struct ucc_fast __iomem *uf_regs; struct ucc_fast_private *uccf; @@ -877,6 +877,7 @@ static int uhdlc_resume(struct device *dev) if (!netif_running(priv->ndev)) return 0; + utdm = priv->utdm; ut_info = priv->ut_info; uf_info = &ut_info->uf_info; uf_regs = priv->uf_regs;