Received-SPF: pass (google.com: domain of linux-kernel+bounces-84078-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: "Eric W. Biederman" <ebiederm@xmission.com>
To: Kees Cook <keescook@chromium.org>
Cc: Jan Bujak <j@exia.io>,  Pedro Falcato <pedro.falcato@gmail.com>,
  linux-mm@kvack.org,  linux-kernel@vger.kernel.org,
  viro@zeniv.linux.org.uk,  brauner@kernel.org,
  linux-fsdevel@vger.kernel.org
References: <c7209e19-89c4-446a-b364-83100e30cc00@exia.io>
	<CAKbZUD2=W0Ng=rFVDn3UwSxtGQ5c13tRwkpqm54pPCJO0BraWA@mail.gmail.com>
	<f2ee9602-0a32-4f0c-a69b-274916abe27f@exia.io>
	<202402261821.F2812C9475@keescook>
	<878r35rkc4.fsf@email.froward.int.ebiederm.org>
	<202402270911.961702D7D6@keescook>
Date: Tue, 27 Feb 2024 14:59:54 -0600
In-Reply-To: <202402270911.961702D7D6@keescook> (Kees Cook's message of "Tue,
	27 Feb 2024 09:22:35 -0800")
Message-ID: <87v869pqr9.fsf@email.froward.int.ebiederm.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: Recent-ish changes in binfmt_elf made my program segfault

Kees Cook <keescook@chromium.org> writes:

> On Tue, Feb 27, 2024 at 09:35:39AM -0600, Eric W. Biederman wrote:
>> Kees Cook <keescook@chromium.org> writes:
>>=20
>> > On Tue, Jan 23, 2024 at 12:23:27AM +0900, Jan Bujak wrote:
>> >> On 1/22/24 23:54, Pedro Falcato wrote:
>> >> > Hi!
>> >> >=20
>> >> > Where did you get that linker script?
>> >> >=20
>> >> > FWIW, I catched this possible issue in review, and this was already
>> >> > discussed (see my email and Eric's reply):
>> >> > https://lore.kernel.org/all/CAKbZUD3E2if8Sncy+M2YKncc_Zh08-86W6U5wR=
0ZMazShxbHHA@mail.gmail.com/
>> >> >=20
>> >> > This was my original testcase
>> >> > (https://github.com/heatd/elf-bug-questionmark), which convinced the
>> >> > loader to map .data over a cleared .bss. Your bug seems similar, but
>> >> > does the inverse: maps .bss over .data.
>> >> >=20
>> >>=20
>> >> I wrote the linker script myself from scratch.
>> >
>> > Do you still need this addressed, or have you been able to adjust the
>> > linker script? (I ask to try to assess the priority of needing to fix
>> > this behavior change...)
>>=20
>> Kees, I haven't had a chance to test this yet but it occurred to me
>> that there is an easy way to handle this.  In our in-memory copy
>> of the elf program headers we can just merge the two segments
>> together.
>>=20
>> I believe the diff below accomplishes that, and should fix issue.
>>=20
>> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
>>=20
>> diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
>> index 5397b552fbeb..01df7dd1f3b4 100644
>> --- a/fs/binfmt_elf.c
>> +++ b/fs/binfmt_elf.c
>> @@ -924,6 +926,31 @@ static int load_elf_binary(struct linux_binprm *bpr=
m)
>>  	elf_ppnt =3D elf_phdata;
>>  	for (i =3D 0; i < elf_ex->e_phnum; i++, elf_ppnt++)
>>  		switch (elf_ppnt->p_type) {
>> +		case PT_LOAD:
>> +		{
>> +			/*
>> +			 * Historically linux ignored all but the
>> +			 * final .bss segment.  Now that linux honors
>> +			 * all .bss segments, a .bss segment that
>> +			 * logically is not overlapping but is
>> +			 * overlapping when it's edges are rounded up
>> +			 * to page size causes programs to fail.
>> +			 *
>> +			 * Handle that case by merging .bss segments
>> +			 * into the segment they follow.
>> +			 */
>> +			if (((i + 1) >=3D elf_ex->e_phnum) ||
>> +			    (elf_ppnt[1].p_type !=3D PT_LOAD) ||
>> +			    (elf_ppnt[1].p_filesz !=3D 0))
>> +				continue;
>> +			unsigned long end =3D
>> +				elf_ppnt[0].p_vaddr + elf_ppnt[0].p_memsz;
>> +			if (elf_ppnt[1].p_vaddr !=3D end)
>> +				continue;
>> +			elf_ppnt[0].p_memsz +=3D elf_ppnt[1].p_memsz;
>> +			elf_ppnt[1].p_type =3D PT_NULL;
>> +			break;
>> +		}
>>  		case PT_GNU_STACK:
>>  			if (elf_ppnt->p_flags & PF_X)
>>  				executable_stack =3D EXSTACK_ENABLE_X;
>
> I don't think this is safe -- it isn't looking at flags, etc. e.g.,
> something like this could break:
>
> =C2=A0 Type=C2=A0 Offset=C2=A0=C2=A0 VirtAddr=C2=A0 PhysAddr=C2=A0 FileSi=
z=C2=A0 MemSiz=C2=A0=C2=A0 Flg Align
> =C2=A0 LOAD=C2=A0 0x003000 0x12000=C2=A0=C2=A0 0x12000=C2=A0=C2=A0 0x0010=
00 0x001000 R E 0x1000
> =C2=A0 LOAD=C2=A0 0x004000 0x13000=C2=A0=C2=A0 0x13000=C2=A0=C2=A0 0x0000=
00 0x001000 RW=C2=A0 0x1000

Yes.  I think it should be modified to only do something is the break
is not on a page boundary (which will automatically limit it's effect
to where we need to do something for backwards compatibility).

Still with a few tweaks and testing I think that is a good path forward
for dealing with the ``regression'' case.

Eric