Received: by 10.223.185.116 with SMTP id b49csp1046872wrg; Fri, 23 Feb 2018 10:57:45 -0800 (PST) X-Google-Smtp-Source: AH8x225rlSd4VfgulcZd6F7rOL4Ct6mvGPZ94rxwslJbxFAke+RzSHsRwJpkS/TFab4pFWCrjpAx X-Received: by 2002:a17:902:47aa:: with SMTP id r39-v6mr2558436pld.72.1519412265768; Fri, 23 Feb 2018 10:57:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519412265; cv=none; d=google.com; s=arc-20160816; b=AJP/0YpJOhhcaynvY02Hu5UqDzyufsld/+ZJvVUy1fLDmBKqoR1P8lJikFI18Y4+Mm I5E0u/SDVagl73IGbmx1uEMI4RzvsK8N29J5GQDKR4BOArDGTVAbxsngL1/jtDU8dZ3l 32gjXX2amnl08b2dP4OzbYiFwrf2nUbBQ8LMLbg/hycB6yfOyIxhuGft5oGeFvWj/NnB 9bqcjZjBvCpA78MkaTYIgrQIxJaPN7Tdhp0M5v4GwOSI18L/hBlz2gZmQV6nRstLhVUA bDJu2ZTNo/nWgUn4LOrlRui4912h0p5LugakI4kk3Da0e9Trx0/38eX+tfbkZ+U7mq0k NvZw== 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 :arc-authentication-results; bh=DOM7e+MJQ+s+aPPN+BBfOxhx9abSYXVY5ElPbUkam4M=; b=XobEGWp5Kf9gwzaKvfRnbQj93K5Yeq3ei+kQem0KUCltDeuRRJioSzhPYWMm5GPl7p 0uUzBbZfFsov5q871OKNc4yKWdwGiZd2TQbbVk67i5v0knEvERdkO/m9Anr2s39l1UXi lhRAoXl1VGMBCTk3DBW/hIlcJLKPqz3v7CQuYDg2P3+Uad8ETRCSGt+MIXR/1VayzrIs OYueOpSTCHqug8huY6XbdIuxsJsDrKjdt0a1xwATVb9gsO1NPxxB+Dh+WH6eVX1RV+u3 SOx3tRCeguWZJFVxYny0A+dnUF7MLqVSQW8avxxB3vmNX+NzQkBHHevqAsY8iiyVqDgR zr8Q== ARC-Authentication-Results: i=1; mx.google.com; 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 l126si2188324pfl.23.2018.02.23.10.57.31; Fri, 23 Feb 2018 10:57:45 -0800 (PST) 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; 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 S935604AbeBWS42 (ORCPT + 99 others); Fri, 23 Feb 2018 13:56:28 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48810 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754449AbeBWS4Z (ORCPT ); Fri, 23 Feb 2018 13:56:25 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 242CF129C; Fri, 23 Feb 2018 18:56:23 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Vyukov , "Peter Zijlstra (Intel)" , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.14 117/159] locking/lockdep: Fix possible NULL deref Date: Fri, 23 Feb 2018 19:27:05 +0100 Message-Id: <20180223170757.473100358@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra [ Upstream commit 5e351ad106997e06b2dc3da9c6b939b95f67fb88 ] We can't invalidate xhlocks when we've not yet allocated any. Reported-by: Dmitry Vyukov Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Fixes: f52be5708076 ("locking/lockdep: Untangle xhlock history save/restore from task independence") Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- kernel/locking/lockdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -4777,7 +4777,8 @@ void lockdep_invariant_state(bool force) * Verify the former, enforce the latter. */ WARN_ON_ONCE(!force && current->lockdep_depth); - invalidate_xhlock(&xhlock(current->xhlock_idx)); + if (current->xhlocks) + invalidate_xhlock(&xhlock(current->xhlock_idx)); } static int cross_lock(struct lockdep_map *lock)