From patchwork Fri Jan 26 19:04:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 126008 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp547619ljd; Fri, 26 Jan 2018 11:05:26 -0800 (PST) X-Google-Smtp-Source: AH8x224SgRGV1MdJp5direIKrUPqM5Oda/sIHjFOLpK6KCCJB1jP7UydORWYknd6vLIIqA4BBYgd X-Received: by 10.98.163.131 with SMTP id q3mr19509567pfl.87.1516993526182; Fri, 26 Jan 2018 11:05:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516993526; cv=none; d=google.com; s=arc-20160816; b=FtpSajS38zrjxXj0E0zSAAnnrdIZJRheZ961tVsFceYhV6cVfcRBF0pc5ZD/uQj8y3 HG/xRwsBflJp3neD4eShBAoxc52cT2tir1xnMOfOLJCGMn1cKnOvRNng7oteYGE5X7by KlL4dpsb79QMsB9yHfhByGcg67lhpw69DvEwOFuDuRvYSQaFHQYa8dPuHTtLoofZHupe /gJOodNrvSEFPstqR3PTUZ2b1TvNRlHeIuXixDK80AgJ1QbmWoGcX21MjZhyaCvNjc25 x7xpBzhh3mwisNDC2U0wDQJab2adGRdbCbDKFRDS0WEa/ZzQIr6Ye9AHU5G0oFqMBhKV DhvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=209+PrRN+sNcAfZx1gxxFaD/s1N4cpSvxg9UKXDZwbE=; b=HaDt3cKDONUj5sLHmUJxnWQb+CxZKm1HMmR/E0eIBzv9ELtZVCiq+ZF5iSw5a7HvsP O4Blz38irD5mDmLQejrhNnS2s+D1ow++Xh2lEvr8zitEDl6t5ygeVUycYgi3TxJFBGms DmTradA/KCy94lHPlhL8AgSXuonSM4BnudMumJJmwOH9zSYAQkdbzTP0y22eA1FjcGvD 9QVzBlg3z7rTewLnHOFazpjmZds5XyX5ThEuyCYtDHEqpybHkWvomzRTHpEkd2j8Ae4E glCXoyRIIHQClpw19yDRtYynAUTXBCK3ifOfLptSC7c/DdhCMACzW6qBZvVUGwKy0UiH WU0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=JMkjS6LC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 h132si3341932pgc.309.2018.01.26.11.05.25; Fri, 26 Jan 2018 11:05:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=JMkjS6LC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686AbeAZTFY (ORCPT + 10 others); Fri, 26 Jan 2018 14:05:24 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34219 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbeAZTFQ (ORCPT ); Fri, 26 Jan 2018 14:05:16 -0500 Received: by mail-wm0-f66.google.com with SMTP id j21so27835485wmh.1 for ; Fri, 26 Jan 2018 11:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=209+PrRN+sNcAfZx1gxxFaD/s1N4cpSvxg9UKXDZwbE=; b=JMkjS6LCBYxn7hgFm4Ei07nb4E3tntrs9YW5KMeirF3D4NRTOW0oXzVQyE0ByegFkU sXiznZ5L8K1jWnhclxVOL72r2I9pxaKSJDWD9OrInXbNagbAY/dGKg3ixMHxKJCO+4ol ujU+CeNJbCMzYliuPwVQ1ACmXbGwiiQ2XvKKnFcrzzGVMpTNRyPtTxiCCGlhE9KywsDq E2GRr7F2BjFZyoNpdGfviFS9QxnQIBxIrDeD0JfT6S7CUo3gP0x1zMUCst83FocxQ0hN uH1hVngrt6to3X8frf8ICmlHegVj2bZMlymvAMUMDN/PpjcChcO5VObrcratiRpiz+Tv flPA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=209+PrRN+sNcAfZx1gxxFaD/s1N4cpSvxg9UKXDZwbE=; b=eig1ifeUvHLbp13Gw7EF7ZzPZpE4W2hR9YLud8T4YQB0E22DV9zHEF+i/hh0eMCmg+ N7bEB2b0r4re5oj2O+poQaDgydQKQNh57MUtUxhE8AnQ5ld7So1MbemsNCYeICdV2PID +Lh3LFr7IfjDP/s9BpyVYGIWo0VH+wCfLVcS19HFMagC8ZDf/H547U5QbA31v/BVXgb6 xNu716/z9AwC7L4OtT/jHICQoEYkl40+JxDAHVnak1gQMvpzU2jTe6JpNvb+qZscsNT/ GddUlR7KDQGO3EJg2ZPdqCmjc5bvpb+yoxv0AADch0Zjy/eY/l3cNpL0xj27e3cHwFL3 a6CQ== X-Gm-Message-State: AKwxytfL4pCGn+3PjEEPKcyLvHKIcMOrrbMJkgWwftD2piBXmLgEKSvV AdX4Bdoxc01mMCcXztitvsEIEQ== X-Received: by 10.80.184.77 with SMTP id k13mr36425150ede.187.1516993515142; Fri, 26 Jan 2018 11:05:15 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id k12sm2719836edl.86.2018.01.26.11.05.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jan 2018 11:05:14 -0800 (PST) From: Bryan O'Donoghue To: horia.geanta@nxp.com, aymen.sghaier@nxp.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, herbert@gondor.apana.org.au, davem@davemloft.net, lukas.auer@aisec.fraunhofer.de, rui.silva@linaro.org, ryan.harkin@linaro.org, "# 4 . 12+" , Bryan O'Donoghue Subject: [RESEND PATCH v2 1/5] crypto: caam: Fix null dereference at error path Date: Fri, 26 Jan 2018 19:04:57 +0000 Message-Id: <1516993501-29646-2-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516993501-29646-1-git-send-email-pure.logic@nexus-software.ie> References: <1516993501-29646-1-git-send-email-pure.logic@nexus-software.ie> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rui Miguel Silva caam_remove already removes the debugfs entry, so we need to remove the one immediately before calling caam_remove. This fix a NULL dereference at error paths is caam_probe fail. [bod: changed name prefix to "crypto: caam: Fix .."] [bod: added Fixes tag] Fixes: 67c2315def06 ("crypto: caam - add Queue Interface (QI) backend support") Tested-by: Ryan Harkin Signed-off-by: Rui Miguel Silva Cc: "Horia Geantă" Cc: Aymen Sghaier Cc: Fabio Estevam Cc: Peng Fan Cc: Herbert Xu Cc: "David S. Miller" Cc: Lukas Auer Cc: # 4.12+ Reviewed-by: Horia Geantă Signed-off-by: Bryan O'Donoghue --- drivers/crypto/caam/ctrl.c | 3 --- 1 file changed, 3 deletions(-) -- 2.7.4 diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 027e121..98986d3 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -809,9 +809,6 @@ static int caam_probe(struct platform_device *pdev) return 0; caam_remove: -#ifdef CONFIG_DEBUG_FS - debugfs_remove_recursive(ctrlpriv->dfs_root); -#endif caam_remove(pdev); return ret;