From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756918AbbAZVBo (ORCPT ); Mon, 26 Jan 2015 16:01:44 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:40660 "EHLO fencepost.gnu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753818AbbAZVBl (ORCPT ); Mon, 26 Jan 2015 16:01:41 -0500 From: David Kastrup To: Linus Torvalds Cc: Josh Boyer , Junio C Hamano , "Linux-Kernel\@Vger. Kernel. Org" , twaugh@redhat.com, Git Mailing List Subject: Re: patch-2.7.3 no longer applies relative symbolic link patches References: Date: Mon, 26 Jan 2015 22:01:11 +0100 In-Reply-To: (Linus Torvalds's message of "Mon, 26 Jan 2015 12:44:33 -0800") Message-ID: <87twzdl0iw.fsf@fencepost.gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds writes: > On Mon, Jan 26, 2015 at 8:32 AM, Josh Boyer wrote: >> >> I went to do the Fedora 3.19-rc6 build this morning and it failed in >> our buildsystem with: >> >> + '[' '!' -f /builddir/build/SOURCES/patch-3.19-rc6.xz ']' >> + case "$patch" in >> + unxz >> + patch -p1 -F1 -s >> symbolic link target '../../../../../include/dt-bindings' is invalid >> error: Bad exit status from /var/tmp/rpm-tmp.mWE3ZL (%prep) > > Ugh. I don't see anything we can do about this on the git side, and I > do kind of understand why 'patch' would be worried about '..' files. > In a perfect world, patch would parse the filename and see that it > stays within the directory structure of the project, but that is a > rather harder thing to do than just say "no dot-dot files". > > The short-term fix is likely to just use "git apply" instead of "patch". > > The long-term fix? I dunno. I don't see us not using symlinks, and a > quick check says that every *single* symlink we have in the kernel > source tree is one that points to a different directory using ".." > format. And while I could imagine that "patch" ends up counting the > dot-dot entries and checking that it's all inside the same tree it is > patching, I could also easily see patch *not* doing that. I consider it rather hard and error-prone and/or an attack vector to choose a course of action for ../ in connection with the -p option. -- David Kastrup