Skip to content

Commit d7afc31

Browse files
Dave Martingregkh
authored andcommitted
arm64: signal: Fix some under-bracketed UAPI macros
[ Upstream commit fc2220c ] A few SME-related sigcontext UAPI macros leave an argument unprotected from misparsing during macro expansion. Add parentheses around references to macro arguments where appropriate. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Fixes: ee072cf ("arm64/sme: Implement signal handling for ZT") Fixes: 3978221 ("arm64/sme: Implement ZA signal handling") Reviewed-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20240729152005.289844-1-Dave.Martin@arm.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent eae33a9 commit d7afc31

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/include/uapi/asm/sigcontext.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ struct zt_context {
320320
((sizeof(struct za_context) + (__SVE_VQ_BYTES - 1)) \
321321
/ __SVE_VQ_BYTES * __SVE_VQ_BYTES)
322322

323-
#define ZA_SIG_REGS_SIZE(vq) ((vq * __SVE_VQ_BYTES) * (vq * __SVE_VQ_BYTES))
323+
#define ZA_SIG_REGS_SIZE(vq) (((vq) * __SVE_VQ_BYTES) * ((vq) * __SVE_VQ_BYTES))
324324

325325
#define ZA_SIG_ZAV_OFFSET(vq, n) (ZA_SIG_REGS_OFFSET + \
326-
(SVE_SIG_ZREG_SIZE(vq) * n))
326+
(SVE_SIG_ZREG_SIZE(vq) * (n)))
327327

328328
#define ZA_SIG_CONTEXT_SIZE(vq) \
329329
(ZA_SIG_REGS_OFFSET + ZA_SIG_REGS_SIZE(vq))
@@ -334,7 +334,7 @@ struct zt_context {
334334

335335
#define ZT_SIG_REGS_OFFSET sizeof(struct zt_context)
336336

337-
#define ZT_SIG_REGS_SIZE(n) (ZT_SIG_REG_BYTES * n)
337+
#define ZT_SIG_REGS_SIZE(n) (ZT_SIG_REG_BYTES * (n))
338338

339339
#define ZT_SIG_CONTEXT_SIZE(n) \
340340
(sizeof(struct zt_context) + ZT_SIG_REGS_SIZE(n))

0 commit comments

Comments
 (0)