The patch titled Subject: ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2 has been added to the -mm tree. Its filename is ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Ding Tianhong <dingtianhong@xxxxxxxxxx> Subject: ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2 add braces around if block Cc: David Laight <David.Laight@xxxxxxxxxx> Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/ubsan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN lib/ubsan.c~ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2 lib/ubsan.c --- a/lib/ubsan.c~ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2 +++ a/lib/ubsan.c @@ -321,10 +321,10 @@ void __ubsan_handle_type_mismatch(struct if (!ptr) handle_null_ptr_deref(data); - else if (data->alignment && !IS_ALIGNED(ptr, data->alignment)) + else if (data->alignment && !IS_ALIGNED(ptr, data->alignment)) { if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) handle_missaligned_access(data, ptr); - else + } else handle_object_size_mismatch(data, ptr); } EXPORT_SYMBOL(__ubsan_handle_type_mismatch); _ Patches currently in -mm which might be from dingtianhong@xxxxxxxxxx are ubsan-dont-handle-misaligned-address-when-support-unaligned-access.patch ubsan-dont-handle-misaligned-address-when-support-unaligned-access-v2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html