Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3535113iob; Tue, 17 May 2022 02:04:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp8V7UuxtqIMMsvv3bqPv8J9Qp+lw4rlhABwFyZs1E/4i/AEbPQWoHcHxNSq356JMMA2QU X-Received: by 2002:a63:1d42:0:b0:3ed:6b3d:c52d with SMTP id d2-20020a631d42000000b003ed6b3dc52dmr13811781pgm.295.1652778281372; Tue, 17 May 2022 02:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652778281; cv=none; d=google.com; s=arc-20160816; b=fUbATOOFdxxK1xOoOz3mVNmryOmIz43mofr787JTkbe/0W09tj6vQZLefhaZNluoh1 DE6g+QNdjxClDRTzNd7RVKB2V5pJ5iPzQL73+wzyyvBOe1U4e7B5biSBkH1OGCvGyvEp ssbvfOCMX552jR+QDBBdItJdDjQ0alBd66ItwL6HhakV9RJ8CGT/OaFh3SR3ygfN2ntk jWH8qawrYYwuG2ZRZPeRIkRr234oO/XfKtWVLo14B9V3c0o1aXHznKqCfd5LtHle9oA7 llqsmU5PquRBvn7oUuWd6htIQvBRxfT1vLLBETtbPhwlpaqee44qAjCvntqYeN9JcgYj ecOQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=1f0Z9m+vbuD/qdSf6InzF9TURBzbVV0rFya1IWbNtOo=; b=N+b1uCrg8RwWeQ/xN3P26mOIhDgNOcH18Iifj80ZE0UU3K2oAqUciONYB94OzwTakB U8lZQUV51E2yB+se5lejcSzus7TWpCKxIANozLgjyoy+8J6KG2yGFu5OuIwhkT3i31nt +Eo9r39MWb9k+3kvLZTETl/8W58nO9hdP6taj1E+bJ7FEeFLTeAlkqYsNe4mucHl4+Jg y81Zts3wup2RJXeAmICTvjnI90JxQuq8enYGIA7PV7r+6JODbGzPnQHqkZmbSyRDjfla Tlrmu0XbSYygr8aWXzpbntxFTciRiGigQEu3H0M+sKqpx5Kbr3XPE70qY1N7/0iNascp hjWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="NpF/ctrL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x37-20020a631725000000b003aa91344e53si15081907pgl.362.2022.05.17.02.04.26; Tue, 17 May 2022 02:04:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="NpF/ctrL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236373AbiEQHbY (ORCPT + 99 others); Tue, 17 May 2022 03:31:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232531AbiEQHbX (ORCPT ); Tue, 17 May 2022 03:31:23 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2023BB16; Tue, 17 May 2022 00:31:22 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id v11so16155427pff.6; Tue, 17 May 2022 00:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1f0Z9m+vbuD/qdSf6InzF9TURBzbVV0rFya1IWbNtOo=; b=NpF/ctrLv7ZXdNrGCvD0hg21ovh+HtPwfrjn2Vn5+Kaz9xxkY2bSYYX+jvXLILwQmK GNLyzcfB9p5vtLQyy080RlDn8BI/wOniIJePP1KfvLiFgwFrQd2W2jb1Gjn+tfUWmqSg oBuNRiQ/JvyIjvF86rQ94VnSC37y9e+rwNNOkVJr86rgx1kQ6N+DBrz75BSMppUymB4a 8vIJ3KqS7hfl2k07Q0i8lZWEIxmNWOfhMWwhtEa/aH0p0X8X5hnj6QH0zvS7wnEo439v 7pQqte7CIDeDmOeRajJft70DLqgo/e06I4kSUJW1Ztg9IyrJ/WQKDI2KPfQxXVjnbHgL hPow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1f0Z9m+vbuD/qdSf6InzF9TURBzbVV0rFya1IWbNtOo=; b=zyW3g2G2h2u+w9s5Z7eI4WNhlAQ0MKGV6pfrTtEdtn2Ov4ubtqGBSZWZKrkrSTzoxt xLuu0MG5SnsAf5Pk5xT0D5VBQJJ04bUsNSjHP8kjm5uz7J8+73SHItvs8z6eVWT5bI0l 00oQq/lgZTVNW21/OFG+sSPL2arWq1YuyGylPI4alW4ZxipVrn/FcVZ4PgMekVY+CyVK iu1s3DhvzLBYp/uV9sm0yPjA8407MClb3j8wEvfDdgYDL4qjgQWxd36wj6HxClCzjhac BNc3erEWubkq+0Y2tGFWCRJA8G0i9j69eTDl/4+PVN45WVK3WjSp1xbNRmr2nfaFQUKr qFxg== X-Gm-Message-State: AOAM533xoHriCkdHJs0oa3y4qMUY/QG2sYliwAz1xVeb0fG0MRDrLXCo OOos9jctqbwvykXSkXrKyOI= X-Received: by 2002:a63:89c7:0:b0:3da:ee16:c84 with SMTP id v190-20020a6389c7000000b003daee160c84mr18727427pgd.320.1652772681611; Tue, 17 May 2022 00:31:21 -0700 (PDT) Received: from localhost.localdomain ([103.197.71.140]) by smtp.gmail.com with ESMTPSA id c22-20020a17090ad91600b001df3d5a441bsm914186pjv.53.2022.05.17.00.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 00:31:21 -0700 (PDT) From: Shida Zhang X-Google-Original-From: Shida Zhang To: tj@kernel.org, lizefan.x@bytedance.com, hannes@cmpxchg.org Cc: zhangshida@kylinos.cn, starzhangzsd@gmail.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH] cgroup: fix potential null pointer risk Date: Tue, 17 May 2022 15:31:06 +0800 Message-Id: <20220517073106.1704628-1-zhangshida@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We previously assumed 'parent' could be null, so null pointer judgment should be added. Signed-off-by: Shida Zhang --- kernel/cgroup/cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index adb820e98f24..7f230b0ab644 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5701,7 +5701,8 @@ static int cgroup_destroy_locked(struct cgroup *cgrp) } spin_unlock_irq(&css_set_lock); - cgroup1_check_for_release(parent); + if (parent) + cgroup1_check_for_release(parent); cgroup_bpf_offline(cgrp); -- 2.25.1