From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 307C1EB64D9 for ; Thu, 15 Jun 2023 07:33:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244442AbjFOHdc (ORCPT ); Thu, 15 Jun 2023 03:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244336AbjFOHc7 (ORCPT ); Thu, 15 Jun 2023 03:32:59 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 165152D76 for ; Thu, 15 Jun 2023 00:32:43 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1b4f9583404so14344155ad.2 for ; Thu, 15 Jun 2023 00:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1686814362; x=1689406362; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fNxDzGJxt2Rtrqq4SUvAlNEkp/z3fWK6RSnN1kjt4g4=; b=KEuKbPWosv9iUFbOmk/dVUFWj71DFPDvQ7CbfsaMugZZDa8k//E8CAEE0n7vr+1f9j LuaB0+g520Fb2VC8JF2Ke6qTtXHB+JzbKxSjCpCxOC9+m6pzYQjTgltBzMdNNNeet8Ea TA9tu43p8KzKc8oCUgqgD54eZUaQvLI/G36bAbrWX2vpG6RWPW0E2Yk20bIdnngUwFnx D1g4aYowz3lb2PduXbvRW/O2vQlVUUk6t5e9VKATy19FtWYWUTaAZlJk+ItZuMhRmNEr ZqgledtelE5KdFama0C4457YvSAPiqJd6KA8hxamKJH0N860sPoNcs9G9Wa6jhBqj3x8 THYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686814362; x=1689406362; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fNxDzGJxt2Rtrqq4SUvAlNEkp/z3fWK6RSnN1kjt4g4=; b=IrY2UQseNyJPmAv2xILqe+IEvehauVK/CpzA88fNYGl4k/zOHx5QUEqjAceRrdt08s uosXWdrse9gc67chll+/AKTSctUCnugkIwcT+5oA+4StkTLkH8tX/EKiIcAZvkzIo6Ly 2u8mK734Qv+kysYJQDcfk6wQLkNKRJ+Tc9/DLXm4d47gvPEJBEvBbpiIVxUxMBo9nuG4 0lWc06xbZUrhFadcvhVV02NGdJnCJOE8o8gkFsQdIwVcgdT+9P6oCcvi0aqm6lYPkIq0 Y24pZCne/vUA+TtLIjx8YmKuIxmmVuLvKf9EiE13Xx+OQ9FX6j7vHCq/oJ26q+1jbMMz Qs5A== X-Gm-Message-State: AC+VfDxxltO3ghHMncFOzVRGAcVhshRaBVojnKx5Ez+hVN3Wz1ZXc5BN h+lWpu7yrntzOGHuL1xxWOTDzw== X-Google-Smtp-Source: ACHHUZ4RNNqwi8HU+cLMcAd/WjHpoTHaaDty+uv58jkXb+0O1XjbgRfWVrmXZ5x8K/OLSw71zvr47w== X-Received: by 2002:a17:903:2350:b0:1a1:b3bb:cd5b with SMTP id c16-20020a170903235000b001a1b3bbcd5bmr17543833plh.62.1686814362490; Thu, 15 Jun 2023 00:32:42 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id z18-20020a170903019200b001acad86ebc5sm13352570plg.33.2023.06.15.00.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 00:32:42 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: roman.gushchin@linux.dev, hannes@cmpxchg.org, shakeelb@google.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 2/2] mm/memcontrol: add check for allocation failure in mem_cgroup_init() Date: Thu, 15 Jun 2023 07:32:26 +0000 Message-Id: <20230615073226.1343-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If mem_cgroup_init() fails to allocate mem_cgroup_tree_per_node, we should not try to initilaize it. Add check for this case to avoid potential NULL pointer dereference. Signed-off-by: Haifeng Xu --- mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c73c5fb33f65..7ebf64e48b25 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7422,6 +7422,8 @@ static int __init mem_cgroup_init(void) struct mem_cgroup_tree_per_node *rtpn; rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, node); + if (!rtpn) + continue; rtpn->rb_root = RB_ROOT; rtpn->rb_rightmost = NULL; -- 2.25.1