Re: head -r320521 (e.g.): another powerpc64 problem: programs using fgets crash trying to store address over code instead of into __cleanup_info__

On 2017-Jul-1, at 8:40 PM, Konstantin Belousov <kostikbel at gmail.com> wrote:

> On Sat, Jul 01, 2017 at 07:42:11PM -0700, Mark Millard wrote:
>> powerpc64 is having programs crash with an attempt
>> to store addresses over code instead of into
>> __cleanup_info__ when fgets is used. ntpd is an
>> example. As is sshd (although I've looked at
>> its details less).
> 
> Yes, I think you are right.  I also see how this worked on amd64,
> where I tested the change.
> 
> Try this.
> 
> diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
> index 18a23216d50..fcf7ff04fed 100644
> --- a/lib/libc/gen/_pthread_stubs.c
> +++ b/lib/libc/gen/_pthread_stubs.c
> _at__at_ -279,10 +279,11 _at__at_ STUB_FUNC2(pthread_kill, PJT_KILL, int, void *, int)
> STUB_FUNC2(pthread_setcancelstate, PJT_SETCANCELSTATE, int, int, void *)
> STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, int, int, void *)
> STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void)
> -STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, int, int)
> -STUB_FUNC2(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void*, void *);
> -STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, int, int)
> -STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, int, int)
> +STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, void, int)
> +STUB_FUNC3(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void *,
> +    void *, void *);
> +STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, void, int)
> +STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, void, int)
> 
> static int
> stub_zero(void)

That fixed the issue for my powerpc64 context. For examples:
sshd and ntpd are running. I'll go rebuild the rest of my
contexts now.

Thanks!

===
Mark Millard
markmi at dsl-only.net