Skip to content

Commit a9de54b

Browse files
committed
Merge: arm64: asm-bug: Add .align 2 to the end of __BUG_ENTRY
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4736 JIRA: https://issues.redhat.com/browse/RHEL-46931 CVE: CVE-2024-39488 Avoid potential unexpected panic() in __BUG_ENTRY() macro. Signed-off-by: Mark Salter <msalter@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: John B. Wyatt IV <jwyatt@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents ceb7d19 + 8ff2cc3 commit a9de54b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm64/include/asm/asm-bug.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
14470: .long 14471f - .; \
2929
_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \
3030
.short flags; \
31+
.align 2; \
3132
.popsection; \
3233
14471:
3334
#else

0 commit comments

Comments
 (0)