Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp846826pja; Wed, 1 Apr 2020 09:45:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs7ovig2zgA9MnqeuVHUSfXnhas+oXmkydo0tvV11zZwzFB/lJ875c8Dx2gu7RWE2KjNtLz X-Received: by 2002:a05:6820:122:: with SMTP id i2mr17535209ood.73.1585759546350; Wed, 01 Apr 2020 09:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759546; cv=none; d=google.com; s=arc-20160816; b=TzR7d5er73JRkBGXYcdqTn//Pscnd6QZKd80tuY75fYrIdkLHf1TEVd7Vj6Mnbeok6 ymroYPG02K9NEkgOFx5fOxc78La83N61AtAAizUrEvO/FJzvVwj/HsASx311KP90gNwu CoWhr3KdLSlec6RYEvZeea1NskHyC0OTKQPcKu0/CLrsf+ne2vE21cXJTV9OBbuGjijs FrZOYP1WytM9++FHBDufQaWVksUZHA34y2ZZoLltwt5b+LvP+NusNw9m/I3tkxGz+LiO opvuO83G1tRKe76q5cij9ibTyMhk0K3VfY+rzMb5P/N9Gx8nptGg0bttlERpmC//p4wY qhgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+WsKBiAcpAqScz9WuBWN54gx7sFprSGwVNxtx1/aVB0=; b=PrWBbTgs3nhkyAKe89zL6vkG28spYMLck3DhKApXe2zoc0FI14lToHylk31SInbcFt p7DD/jZibu86OaQ9Rvs7HRIGwHva92A/I7X4Vx7ph/vA4qUDFEYUJ4dCiwO5Mtc/GFmC srQBKXiK3HSR6dbqZVjqK2NNCgO4G7UfbOdIoBi9kDVcz6/KDYdSA4DLhQY63u55WigV ycDfYsHl+6NeLHD/1WjvtZ8MhhVr+r2BPvUP/ieCLPwN1D3V+5lf+0zc+v0KsGM9rjdx D4iMzAD6/9wLMiqhi5of0Ryd7xSoXlyoj/OWQTqtGo4jUbF2MaB9MTY1rOTGgfmo7bR7 wsag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jVcvjcog; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f33si358996otf.64.2020.04.01.09.45.33; Wed, 01 Apr 2020 09:45:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jVcvjcog; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389766AbgDAQor (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:45846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388037AbgDAQop (ORCPT ); Wed, 1 Apr 2020 12:44:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1E62206E9; Wed, 1 Apr 2020 16:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759485; bh=BEppHJSF0Q3dBGNXBQdv4LxwkkElFKHdTM/3CINeEuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jVcvjcogbiu63iggfkIesiT2VQG+h8y3SyZ4tqWlTPdsCIvO0lL5kR9PCvuv1wO/h dT947KoB6/fcfuXUWFDTIiygktFs5e6feZdSawzuFg6ZGvqJjHUqwtsPjZQGdVF3XH nBhph4BQWCJGwQGKIJnyLiBEO2Caedd+oy35gkqI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tycho Andersen , Tejun Heo , Sasha Levin Subject: [PATCH 4.14 077/148] cgroup1: dont call release_agent when it is "" Date: Wed, 1 Apr 2020 18:17:49 +0200 Message-Id: <20200401161600.703386393@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tycho Andersen [ Upstream commit 2e5383d7904e60529136727e49629a82058a5607 ] Older (and maybe current) versions of systemd set release_agent to "" when shutting down, but do not set notify_on_release to 0. Since 64e90a8acb85 ("Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper()"), we filter out such calls when the user mode helper path is "". However, when used in conjunction with an actual (i.e. non "") STATIC_USERMODEHELPER, the path is never "", so the real usermode helper will be called with argv[0] == "". Let's avoid this by not invoking the release_agent when it is "". Signed-off-by: Tycho Andersen Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- kernel/cgroup/cgroup-v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index d148965180893..545f29c5268d7 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -824,7 +824,7 @@ void cgroup1_release_agent(struct work_struct *work) pathbuf = kmalloc(PATH_MAX, GFP_KERNEL); agentbuf = kstrdup(cgrp->root->release_agent_path, GFP_KERNEL); - if (!pathbuf || !agentbuf) + if (!pathbuf || !agentbuf || !strlen(agentbuf)) goto out; spin_lock_irq(&css_set_lock); -- 2.20.1