From patchwork Mon Mar 1 16:11:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 388653 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3508768jap; Mon, 1 Mar 2021 08:48:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0u4iJF0ycFw/55ZUNg2MGSaqg8VQDZTpeCrzPVKVnrSGavHO+VBlripaMK1626JlMhD5S X-Received: by 2002:a05:6402:10cd:: with SMTP id p13mr16718645edu.22.1614617339309; Mon, 01 Mar 2021 08:48:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614617339; cv=none; d=google.com; s=arc-20160816; b=HEH4qtyjN0QW3rPJ2f4nmyOUXvh0ur3UoMojSaty87fH0w5XSnFSo/QLarvy6YxJ6f uSoTv0KiEoNscAuaXilU1qmOGPz4meZsQwFCcT48bDZ4ipVb/AmMz43oonJ8xFKMoMex +++xHxrnmkMyJcxuXDsmrGumB1inMBK+H2GPqG7BreyvbOPTcn8gJnHSrdEtm6vaZ+ZX 4ZyLM4nMYdxFz8Bljukj04+34+7lwFjaUrSuAAZ0die25a9iVGox+ZsT+AMrs14TXdXD YCIc93poJz/ip7z/DfWxpXnkBMxSO6P3rFjRTYVEsJc8vilT8mrGJGE8yi3rbIAOhWkr prcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tsH8dFasutqrDIod1iShRvoRpqwpDkaF8POp9SYXNMM=; b=Mc/IPcAvffFDt1irn52jhBCKc7IvmInmoiheaOmkH06g5GMLMYX61EZqCvrCUj/5dM eoagjMWcwwQ02ynGtxasseVI0XCKEzg5QKQF74+HXYlo9Vv6fWKHjBlEJojBs0wBm8pQ 0CUzwqgqPLmJzaRChELbXdiEL5aAPiaJHJPoCEQLsJ2NQdVdPBX4jeuQBdRCgMGQQyig FeYTQxzMhSHLCC6JvGpyz0nOQSSG01xfvHf3ytP1zSZOO7nkkxfO2aZ2f5ylGQ1C9Pwa +oazsrAObo2MxKWTwKQCeiDTXOwU3DhhqbhOjpZ6lnib6xB+lwlyPjSSRZ/iNEViHYA8 rDEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="iT1J/IOR"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h28si12089111edj.309.2021.03.01.08.48.58; Mon, 01 Mar 2021 08:48:59 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="iT1J/IOR"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233119AbhCAQra (ORCPT + 13 others); Mon, 1 Mar 2021 11:47:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:41536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234021AbhCAQjC (ORCPT ); Mon, 1 Mar 2021 11:39:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0BCA764F87; Mon, 1 Mar 2021 16:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614616097; bh=VzcM2zK0CXIH9uHqMj0F35NuxWY5WDsoXlYHg6auVLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iT1J/IORtXVOAo9Nn0yapmBdtlua8mmOxCbosQmJCD+ouRKctFhx7jAAHEo6yqb+f e6AL4Q9OnXxFspSkcnUaS8q9kJe6oBk0FiedMo8stOxQdUDNva5R8JcUwoILtv+kNs thzyjpkt7PaNIurrqJnmtCmjwcTd6KwZR2wDeR8o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sumit Garg , Daniel Thompson Subject: [PATCH 4.14 009/176] kdb: Make memory allocations more robust Date: Mon, 1 Mar 2021 17:11:22 +0100 Message-Id: <20210301161021.416348129@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161020.931630716@linuxfoundation.org> References: <20210301161020.931630716@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sumit Garg commit 93f7a6d818deef69d0ba652d46bae6fbabbf365c upstream. Currently kdb uses in_interrupt() to determine whether its library code has been called from the kgdb trap handler or from a saner calling context such as driver init. This approach is broken because in_interrupt() alone isn't able to determine kgdb trap handler entry from normal task context. This can happen during normal use of basic features such as breakpoints and can also be trivially reproduced using: echo g > /proc/sysrq-trigger We can improve this by adding check for in_dbg_master() instead which explicitly determines if we are running in debugger context. Cc: stable@vger.kernel.org Signed-off-by: Sumit Garg Link: https://lore.kernel.org/r/1611313556-4004-1-git-send-email-sumit.garg@linaro.org Signed-off-by: Daniel Thompson Signed-off-by: Greg Kroah-Hartman --- kernel/debug/kdb/kdb_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/debug/kdb/kdb_private.h +++ b/kernel/debug/kdb/kdb_private.h @@ -233,7 +233,7 @@ extern struct task_struct *kdb_curr_task #define kdb_do_each_thread(g, p) do_each_thread(g, p) #define kdb_while_each_thread(g, p) while_each_thread(g, p) -#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) +#define GFP_KDB (in_dbg_master() ? GFP_ATOMIC : GFP_KERNEL) extern void *debug_kmalloc(size_t size, gfp_t flags); extern void debug_kfree(void *);