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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 419F9EB64DC for ; Thu, 15 Jun 2023 07:32:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCAE26B0074; Thu, 15 Jun 2023 03:32:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7B358E0002; Thu, 15 Jun 2023 03:32:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A432F8E0001; Thu, 15 Jun 2023 03:32:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 95D116B0074 for ; Thu, 15 Jun 2023 03:32:45 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 605ACB0199 for ; Thu, 15 Jun 2023 07:32:45 +0000 (UTC) X-FDA: 80904165090.21.AB68A15 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf05.hostedemail.com (Postfix) with ESMTP id 9E88E100012 for ; Thu, 15 Jun 2023 07:32:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=KEuKbPWo; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf05.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686814363; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=fNxDzGJxt2Rtrqq4SUvAlNEkp/z3fWK6RSnN1kjt4g4=; b=NIwBKMuKzeQ/lTzfMaauprAe6xnCKaz3TRsmWk973Yd3jmzC7bikb0bUSDnRv0QCJMTApr DOoOv+1bh8a1eNXo/OILcZllYR7nCsBJo4jXmrrNynnaMPuUcZ9a7wnV2DC92C5OzmDry0 6v8UnyVL9cpWf52gsLo5HzHBN1N/e50= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=KEuKbPWo; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf05.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686814363; a=rsa-sha256; cv=none; b=u216SrQoCcY5n6EctF6rekeUc49Lb+xzgs8Byth50vFoDWnGfp2H9pvlrtf6lkhwsyusrY tDSUoWZ2o4miRfjMaqBTzEJBP4lm8vG6Q4aTUCTmzAlHiLBZlcviVg1i+lh2MCn2qCoXbZ k/toneFBC6paDrEXVfMCBbclBrR7ZO4= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1b51780c1b3so3139975ad.1 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=TUpfmMpWLeIR2J0H+GwHFJ/5zm+jRxAm0UihpVQfFn1qpt+0AmE0J6Kk6UZ8LE7Ai1 qNgVe0Qv7i8hnku6dMlWlROjndRba4jEgsuB3AE1RB3+nLiAtJ5uH3o+WNK668ubNoxW jwiRMB/dT0dy2dZmIRZzmQsEYdyEkAymjntpVAnFdA0nJKV5iUFQCDHIsYPImzVnweEZ Rt/0CsqfS5pL+AINSudMfmOQ+fU3xqGzy1LplqZuwBl1zB09QJdv+0p3LvRxWT2QL0xn XsOZhZq902Q/8ZEBH57yQaB0IgjU512CeIhCua5gfG4/rZ17CGlxPgmUfsO5tRXkKpeQ HLpw== X-Gm-Message-State: AC+VfDxU+B3JMfrgZfdyqySILFbJXWd2ggFzOfCKgz2qNza0qiL+xhuM RAOv0g2bEcpv9okIdq5b9x6uQw== 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 X-Rspamd-Queue-Id: 9E88E100012 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: qwzepf5gzuydyxy6t9zafw1qf3wmczpc X-HE-Tag: 1686814363-97829 X-HE-Meta: U2FsdGVkX19cJr9ToBjOOW3nfcsS+NpruqwvtSJYrwfPhiA+NhAi8Nhxcz6riagTZiUpO96gmYKI1soREcJme9SqyVTAHLQC0CBPP0wdcSryU68Yau1SVV7jbv9zTVzmYoF6rfhVlrKRtRQnyElLEdRj+/5ll2f+fdnxaC05qJYZ8cAWhIplz4lKvO0PcUEGV8yGnMKWsIxkW8dELd/9jHI78VEawTkGe961hjM/NXpZ01QdEvx1ODPP2pyWGoONAmTedgZhWQtBwGYxrTtbEjnSpm63adQcxygB8St4XNwPTwq+YxW8uOsEm6gmW9omNtK6EVXi572cXCrjimZz9T4fv73sZOSDzHva07Rb39D21zkJdoifxLnwtMJvST+FudG45OjLMGhCCxdW6iYjtL84GK22GXkt0D2iNg0a4ihxkGie5ANQVDQw10/ZzXb54dEaMKvW8+DvPM1QRIn3rOhBBwkNI8ybYqH7tfJXpPNjFGC7ZAtdtEBikbLSXJvW8IbhG/g/z/uR7lfK7A8TBZW0zUzWbaXLJYHPRVtFTFHUfF7e1c1o1YPU2y2T8DuPalhAzFBXOldc9IzmcEbth3g0onbLcO3YhfDvW9WcHBFyda9M2FRxlmb2HVmEpwmcOb13mz6dE0g7XFSSZxZP5l04Gh5IQnPyOTyCYgVQipYgD2muqDWrsSnu9LPeEOcyyCTtNPlvKLF5NQ2Q53PEUdQmE/3eRYHod662jGzFvGzjYwREltkf4c2w3JdmlC4fRIv7+W1ACiTyxpyeytb9mAkbzvyJHVRC2owu+g9fv9KlI48l391RXkWe1lZhr0ZSFut44goKDw1C9+lRSa3WRxFT4jjV32/OXA8lDAwtpbcioBk4xu0KTXdUfDL2IyD1XHHCjWTy3Quu9/eKHYX8r7lCijGEUxlTi9ErIbLBvl0HUEJ/RV5aGWEFJInf6MZu8BFzZA7KRb4r8PX7U7o jHM3PJ4C JT3pQ+Oi/RpMuKWEYAYaZNhdgZaqJwemayEaV4AkgqPz3pbN6xwnwtFTZ+1vyKvYK0YgTK9zXxUMkEtYvMIgn9jG1rfH64GJLgPf8rAw8wKBQ7VnqogyDFPsY4gockGKSPWIjRcISCZoxFpRCUy4JN32lEGPU1yQcLN3J/Ghgl1achtvxjRC221QHI6GnZ+BrTVXsCB8D4YcrV9zsCQl8qJ2iC8bIaFm2oUd7i0Wpc0xJGOr1FQyPTsDH0FwUkkcywK9CKGNj55+H2N0n2GKpfLyz5vlowCJN6DoOn85YU0pN8uGdStM3mhk9n0Q2A4lhCBSZN6+oo61uNqzkCFId3pbLXnY3oiizkGeG2n5BCLMh6cx+VB9jPlW2GErOZ0RRXbuXe9zwwt5Iki9MdlEFFaKN6OUc2mit1fkVwQPDYXGh6Q/+/08N16o64E5k4L1LpJ0PaSDqzkBGa0lxmpRf9mWDfrOw32pUpSy6 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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