From patchwork Wed Feb 28 00:58:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 207578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3073820dyb; Tue, 27 Feb 2024 17:31:37 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXaatTim9GbxslM/dQtXNWmt5DxMvcvdtk/AcboiuZP5bi4nSKCZyMQyevoPmAAy+fpjaZfGwtODwRMk3FLTMGf+ds4BA== X-Google-Smtp-Source: AGHT+IEDQ+8vCJ8JJlB81HbGx9omZ2uZlGbroaFAmFcXb4veY0p/dPrLw8WM2TM+R6NU7z64/Ctg X-Received: by 2002:a17:90a:a58e:b0:29a:ad3f:264c with SMTP id b14-20020a17090aa58e00b0029aad3f264cmr7257732pjq.6.1709083896991; Tue, 27 Feb 2024 17:31:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709083896; cv=pass; d=google.com; s=arc-20160816; b=e1cdhyl5g55dX+LJJLOBAHuixqzfGI3m/I/5E3x08huTe+5JdznJytkwZsnZnckHoe /prxBI/lbLSQ3ONxD1GV9piAUHjVzdEsPi9oVysvyPx0IlozXW39GaW4jxWQv2ineFGB hestuvOX65CHDrBXZTU3pZA0gu00viGuxXCoVKUELkYk36EtKXHQewjtjF0Sn9dOxJGK XEn86tjLnemR6YYNlb30DI8qqUC9ondiv1NRJZLq1vQ/8XQpiF12JVhoyGhQ3jPdQNsp YMQh2/jtVRPZiyP3jCLN6R6tpUBvcthbTQoKUtXMDP9NUB7eJUyNfnl+FwGdAdWpBt/V dYtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=St3NN2vP8vgmPHt07QiH+ykevs0W7YQdgC9No+mGpjw=; fh=627FPP9nCiHcRGWV/iy2zlmBCiZ81oYZ4t/DMQZ1ymM=; b=Qpla0py9IdaoH6g/MPiNMnK40z4UehHCM63TMR+UNy5NdsjYdgHyhkQp2SxMhUzQpb XDPTgIhzdADY0hrPQwp5QOq5D1HOvpkG4gF+NA6qSYMu6GVhu5YjFSnugnf6k3782Plm 8DEAOxi0pE8goBV3lTED06u7BS51MwoEhFTUJwTrznS5RrHQhrZOKpWVZTxxU0C94iTo 06INY9dQgG3qXSEcOqnmIZKLUZ/mL8AMRve4N/dJb0qBQifupBBwZh4ewAO4eUj6eyj0 KXxp/QDvHUv2/Q1wzX77EZfsLWMNMkPcvJOlXnVVs+5oZibw0l0f9d6OMj//sobD/+g3 hO+w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=C0PVO0T8; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-84292-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84292-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id o22-20020a637e56000000b005d8c5595ddbsi6404699pgn.271.2024.02.27.17.31.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 17:31:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84292-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=C0PVO0T8; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-84292-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84292-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id F20E3B28597 for ; Wed, 28 Feb 2024 00:58:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 027232107; Wed, 28 Feb 2024 00:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C0PVO0T8" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEB7CA34 for ; Wed, 28 Feb 2024 00:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709081904; cv=none; b=Qep4ue/zhBJCRL2AfomP4bLjW3CaZ574WPOjicaZ6uB+Gzwf05nfAH3vPQTLrHhR4NXISUYQv3T5HibziJrb5YrQeDaAksx/T9z/zndhszxvuI7MAOZuD4dJXe7xzi/6/ozOliATiZ8kHJyh/7yWHiZ75BGQbwcSvIwuHH89PtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709081904; c=relaxed/simple; bh=izofhJ8GuVB4VlLoh/I9ckNg1zRYgM+qGaEG4v36yds=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=It5io9CJ6kq0w1kWf/LkDomfFDhFupvuyJcUHHUcAVaQqvdnFcyN0Cx5BqxZlIfdc54TG1Gj7lU/VCTf3WZcFgteSATCFOf1hKjEvsVbqXFWSPG3AAYA+WCAa5oSTMQIz4bt1m2qlabXmEBdjUgL48Is8BTuAwWp8czxiRQT6MA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=C0PVO0T8; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709081901; 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=St3NN2vP8vgmPHt07QiH+ykevs0W7YQdgC9No+mGpjw=; b=C0PVO0T8OqgC0FXt3Ux1uX1j/s4olnKs+Zj4++4FbhPo9qxUGvdZjEti9XnfebtWayltpE OhKObQ4Nd0Me2YkZsb035sdFqD6BF54w4Up09AQBruDcUOqihWg+jGm4NtmJVQTloVu9n4 gF7Ytw6/7/7IjGQgLyHuGxD+aPsl6Vs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-678-wgJFoDK_Ol6MPTAILi7yVQ-1; Tue, 27 Feb 2024 19:58:20 -0500 X-MC-Unique: wgJFoDK_Ol6MPTAILi7yVQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A59C388D183; Wed, 28 Feb 2024 00:58:19 +0000 (UTC) Received: from llong.com (unknown [10.22.17.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88E6A1CBC8; Wed, 28 Feb 2024 00:58:18 +0000 (UTC) From: Waiman Long To: Tejun Heo , Zefan Li , Johannes Weiner Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Mirsad Todorovac , Waiman Long Subject: [PATCH] cgroup/cpuset: Fix a memory leak in update_exclusive_cpumask() Date: Tue, 27 Feb 2024 19:58:01 -0500 Message-Id: <20240228005801.429847-1-longman@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792104356589534794 X-GMAIL-MSGID: 1792104356589534794 Fix a possible memory leak in update_exclusive_cpumask() by moving the alloc_cpumasks() down after the validate_change() check which can fail and still before the temporary cpumasks are needed. Fixes: e2ffe502ba45 ("cgroup/cpuset: Add cpuset.cpus.exclusive for v2") Reported-by: Mirsad Todorovac Closes: https://lore.kernel.org/lkml/14915689-27a3-4cd8-80d2-9c30d0c768b6@alu.unizg.hr Signed-off-by: Waiman Long Tested-by: Mirsad Todorovac --- kernel/cgroup/cpuset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index ba36c073304a..7260f095802a 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2598,9 +2598,6 @@ static int update_exclusive_cpumask(struct cpuset *cs, struct cpuset *trialcs, if (cpumask_equal(cs->exclusive_cpus, trialcs->exclusive_cpus)) return 0; - if (alloc_cpumasks(NULL, &tmp)) - return -ENOMEM; - if (*buf) compute_effective_exclusive_cpumask(trialcs, NULL); @@ -2615,6 +2612,9 @@ static int update_exclusive_cpumask(struct cpuset *cs, struct cpuset *trialcs, if (retval) return retval; + if (alloc_cpumasks(NULL, &tmp)) + return -ENOMEM; + if (old_prs) { if (cpumask_empty(trialcs->effective_xcpus)) { invalidate = true;