• Eric W. Biederman's avatar
    signal: Correct the offset of si_pkey and si_lower in struct siginfo on m68k · 8420f719
    Eric W. Biederman authored
    The change moving addr_lsb into the _sigfault union failed to take
    into account that _sigfault._addr_bnd._lower being a pointer forced
    the entire union to have pointer alignment.  The fix for
    _sigfault._addr_bnd._lower having pointer alignment failed to take
    into account that m68k has a pointer alignment less than the size
    of a pointer.  So simply making the padding members pointers changed
    the location of later members in the structure.
    
    Fix this by directly computing the needed size of the padding members,
    and making the padding members char arrays of the needed size.  AKA
    if __alignof__(void *) is 1 sizeof(short) otherwise __alignof__(void *).
    Which should be exactly the same rules the compiler whould have
    used when computing the padding.
    
    I have tested this change by adding BUILD_BUG_ONs to m68k to verify
    the offset of every member of struct siginfo, and with those testing
    that the offsets of the fields in struct siginfo is the same before
    I changed the generic _sigfault member and after the correction
    to the _sigfault member.
    
    I have also verified that the x86 with it's own BUILD_BUG_ONs to verify
    the offsets of the siginfo members also compiles cleanly.
    
    Cc: stable@vger.kernel.org
    Reported-by: default avatarEugene Syromiatnikov <esyr@redhat.com>
    Fixes: 859d880c ("signal: Correct the offset of si_pkey in struct siginfo")
    Fixes: b68a68d3 ("signal: Move addr_lsb into the _sigfault union for clarity")
    Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
    8420f719
siginfo.h 10.5 KB