Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp846274rwb; Fri, 23 Sep 2022 05:06:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dI80Hb7yw9fwfloiPm8UqEPvIN3ssLOGTxqLZkobWEsi6s0rQNruttCiXuxLbUMltopCN X-Received: by 2002:aa7:db0a:0:b0:44e:5868:f489 with SMTP id t10-20020aa7db0a000000b0044e5868f489mr8090583eds.299.1663934760512; Fri, 23 Sep 2022 05:06:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663934760; cv=none; d=google.com; s=arc-20160816; b=DzJrAq36lkvRPJMwdQIll3yxzR58vN9dpQpwGI1CcJpN2LiD0L6jMzvItR/JFxRRgO nRL1rNpddBt31uZYV2u1o2Cxky8wKwvEVmbUh/vnSR48ggov8mtU1ZuSEndkxi+c2dlo XuoFKlS8bZCUW190p2Fr8HPu0NGvIltLaCadcCdOO57Ue4srwWZAZ+dt1b0penrCssKb S4e8MyKuY4RwI5jpnKnPBg1nvIc5GqXztCQKTbiyqwD7eTigc2XVHZh563tbesSvH6op FpQhyDYoS2lb3CHzK68f916zfBn+zx+xRveN5KCOE5o8U14Dcg2QfRjuhOPbJeiZHBZ1 ulxQ== 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=LSqlKmINboHpHtUNR10HWYgYVkgSi8ssnna63UQWneM=; b=iB7mYK18zweqqsvp6TNuzy7jNIhpdigwFJ2sduvGsDT2ga2lfBtC9exV++FGfBMPfv 6sJm56QlmUes178rUUrr4Upj86cEiGAy/C4b/DRHsGPk5S6Gg2x4ILVlWc9naPJxZeLr SBjn6YRy6aC+TvBsZzPy5/6frIAjYlw+iQ/5Mny68Zs7fjjZYPLqXY/YJdvJ77BMXdGd PaY39rtAw5RWrwOJYvwTkHr3exUtIBKONP+y9Qb+KXErb01SzyQgop+QLn05fVqbTTuD Lfm6RQZoet/JNCRAS2wglku46BIWdXXo45j4viR00mbqVofzCDV5GKV2avQelil9Zje2 7knQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E5bDjaf3; 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=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fr34-20020a170906892200b00730a4424a40si6225250ejc.160.2022.09.23.05.05.34; Fri, 23 Sep 2022 05:06:00 -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=@redhat.com header.s=mimecast20190719 header.b=E5bDjaf3; 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=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231371AbiIWLvg (ORCPT + 99 others); Fri, 23 Sep 2022 07:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231346AbiIWLve (ORCPT ); Fri, 23 Sep 2022 07:51:34 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23185138F0D for ; Fri, 23 Sep 2022 04:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663933893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LSqlKmINboHpHtUNR10HWYgYVkgSi8ssnna63UQWneM=; b=E5bDjaf39WQFRrYS9zn6lssmvG4k5AtQ/0gjHG+dmazl5tNakQ/mpy1mM4VyKC774OyAhU NF2ahbmsfkqAA3MBuqRvkCBtYXGmFy5KfUIdqECfhfrGWLB3jp/JZNF3t0tZ41bUqu5l/B FGmHmcA2RfM27yCGv+8KaqarvWQZkPs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-41-NhEncvQePGKBOhXkHh4LGQ-1; Fri, 23 Sep 2022 07:51:27 -0400 X-MC-Unique: NhEncvQePGKBOhXkHh4LGQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AE124101245C; Fri, 23 Sep 2022 11:51:26 +0000 (UTC) Received: from localhost (ovpn-8-24.pek2.redhat.com [10.72.8.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id B130B40C6EC2; Fri, 23 Sep 2022 11:51:25 +0000 (UTC) From: Ming Lei To: Tejun Heo , linux-kernel@vger.kernel.org Cc: cgroups@vger.kernel.org, Ming Lei , Marco Patalano , Muneendra Subject: [PATCH] cgroup: fix cgroup_get_from_id Date: Fri, 23 Sep 2022 19:51:19 +0800 Message-Id: <20220923115119.2035603-1-ming.lei@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 cgroup has to be one kernfs dir, otherwise kernel panic is caused, especially cgroup id is provide from userspace. Reported-by: Marco Patalano Fixes: 6b658c4863c1 ("scsi: cgroup: Add cgroup_get_from_id()") Cc: Muneendra Signed-off-by: Ming Lei --- kernel/cgroup/cgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index e4bb5d57f4d1..5f2090d051ac 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6049,6 +6049,9 @@ struct cgroup *cgroup_get_from_id(u64 id) if (!kn) goto out; + if (kernfs_type(kn) != KERNFS_DIR) + goto put; + rcu_read_lock(); cgrp = rcu_dereference(*(void __rcu __force **)&kn->priv); @@ -6056,7 +6059,7 @@ struct cgroup *cgroup_get_from_id(u64 id) cgrp = NULL; rcu_read_unlock(); - +put: kernfs_put(kn); out: return cgrp; -- 2.31.1