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;
Message-ID: <71dbe196-a3d4-41f4-a00c-24f8b0222288@kernel.org>
Date:   Mon, 29 Aug 2022 09:12:39 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.0
Subject: Re: [PATCH 5.19 145/365] kbuild: dummy-tools: avoid tmpdir leak in
 dummy gcc
Content-Language: en-US
To:     Ondrej Mosnacek <omosnace@redhat.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux kernel mailing list <linux-kernel@vger.kernel.org>,
        Linux Stable maillist <stable@vger.kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
References: <20220823080118.128342613@linuxfoundation.org>
 <20220823080124.294570326@linuxfoundation.org>
 <9996285f-5a50-e56a-eb1c-645598381a20@kernel.org>
 <CAFqZXNv2OvNu7BctW=csNLevgGWyoT1R81ypH8pGoAeo3vd4=w@mail.gmail.com>
From:   Jiri Slaby <jirislaby@kernel.org>
In-Reply-To: <CAFqZXNv2OvNu7BctW=csNLevgGWyoT1R81ypH8pGoAeo3vd4=w@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 27. 08. 22, 10:34, Ondrej Mosnacek wrote:
> On Sat, Aug 27, 2022 at 9:51 AM Jiri Slaby <jirislaby@kernel.org> wrote:
>> On 23. 08. 22, 10:00, Greg Kroah-Hartman wrote:
>>> From: Ondrej Mosnacek <omosnace@redhat.com>
>>>
>>> commit aac289653fa5adf9e9985e4912c1d24a3e8cbab2 upstream.
>>>
>>> When passed -print-file-name=plugin, the dummy gcc script creates a
>>> temporary directory that is never cleaned up. To avoid cluttering
>>> $TMPDIR, instead use a static directory included in the source tree.
>>
>> This breaks our (SUSE) use of dummy tools (GCC_PLUGINS became =n). I
>> will investigate whether this is stable-only and the root cause later.
> 
> It looks like both the Greg's generated patch and the final stable
> commit (d7e676b7dc6a) are missing the addition of the empty
> plugin-version.h file. It appears in the patch's diffstat, but not in
> the actual diff. The mainline commit does include the empty file
> correctly, so it's likely a bug in the stable cherry pick automation.

Right, this fixed the issue for me:
--- 
a/patches.kernel.org/5.19.4-144-kbuild-dummy-tools-avoid-tmpdir-leak-in-dummy-.patch
+++ 
b/patches.kernel.org/5.19.4-144-kbuild-dummy-tools-avoid-tmpdir-leak-in-dummy-.patch
@@ -20,6 +20,8 @@ Signed-off-by: Jiri Slaby <jslaby@suse.cz>
   scripts/dummy-tools/gcc | 8 ++------
   1 file changed, 2 insertions(+), 6 deletions(-)

+diff --git 
a/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h 
b/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
+new file mode 100644
  diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc
  index b2483149bbe5..7db825843435 100755
  --- a/scripts/dummy-tools/gcc

>>> Fixes: 76426e238834 ("kbuild: add dummy toolchains to enable all cc-option etc. in Kconfig")
>>> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
>>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>> ---
>>>    .../dummy-tools/dummy-plugin-dir/include/plugin-version.h | 0
>>>    scripts/dummy-tools/gcc |    8 ++------
>>>    1 file changed, 2 insertions(+), 6 deletions(-)
>>>    create mode 100644 scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
>>>
>>> --- a/scripts/dummy-tools/gcc
>>> +++ b/scripts/dummy-tools/gcc
>>> @@ -96,12 +96,8 @@ fi
>>>
>>>    # To set GCC_PLUGINS
>>>    if arg_contain -print-file-name=plugin "$@"; then
>>> -     plugin_dir=$(mktemp -d)
>>> -
>>> -     mkdir -p $plugin_dir/include
>>> -     touch $plugin_dir/include/plugin-version.h
>>> -
>>> -     echo $plugin_dir
>>> +     # Use $0 to find the in-tree dummy directory
>>> +     echo "$(dirname "$(readlink -f "$0")")/dummy-plugin-dir"
>>>        exit 0
>>>    fi

thanks,
-- 
js
suse labs