[PATCH] Fix crashes on invalid input in IBM gconv modules [BZ #17325]

[Carlos O'Donell]

On 08/30/2014 06:26 AM, Florian Weimer wrote:
> On 08/29/2014 11:54 PM, Roland McGrath wrote:
>>> Florian Weimer <fweimer@redhat.com> writes:
>>>
>>>> +    if (__builtin_expect (rp2->start == 0xffff, 0)                  \
>>>
>>> Please use either this
>>>
>>>> +    if (__builtin_expect (ch == 0xffff, 0)                      \
>>>
>>> or this consistently.
>>
>> Use neither.  Use __glibc_{un,}likely consistently.
> 
> I would like to do this in a future cleanup across all gconv modules,
> after the 2.20 release. For this patch, I went with the existing
> style in the changed files. This also simplifies backporting.

At this late in the 2.20 freeze the CVE fix should be the minimal
change possible that fixes the bug for 2.20.

You get an ACK from me to use __builtin_expect for now, since it
also simplified backports of this security bug fix by minimally
touching code.

I am however holding you responsible to cleanup the uses after
2.20 branches >:-)

Cheers,
Carlos.