On Mon, Jul 16, 2018 at 3:11 AM, Ulf Hansson <ulf.hansson@xxxxxxxxxx> wrote: > On 12 July 2018 at 21:59, Kees Cook <keescook@xxxxxxxxxxxx> wrote: >> Looks like the adjusted syntax wasn't fully build tested. This fixes >> failures with powerpc builds: >> >> drivers/mmc/host/mxcmmc.c: In function ‘mxcmci_swap_buffers’: >> drivers/mmc/host/mxcmmc.c:296:51: error: expected ‘)’ before ‘;’ token >> void *buf = kmap_atomic(sg_page(sg) + sg->offset; >> ^ >> drivers/mmc/host/mxcmmc.c:299:1: error: expected ‘,’ or ‘;’ before ‘}’ token >> } >> ^ >> >> Fixes: b189e7589f6d3 ("mmc: mxcmmc: handle highmem pages") >> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> > > Thanks, applied for fixes! I just checked again, and while I see this in linux-next, I would expect this to be in 4.18, since this fixes a 4.18-introduced build failure for some PPC configurations. Can this please be included in 4.18? Thanks! -Kees > > Kind regards > Uffe > >> --- >> drivers/mmc/host/mxcmmc.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c >> index 75f781c11e89..de4e6e5bf304 100644 >> --- a/drivers/mmc/host/mxcmmc.c >> +++ b/drivers/mmc/host/mxcmmc.c >> @@ -293,9 +293,10 @@ static void mxcmci_swap_buffers(struct mmc_data *data) >> int i; >> >> for_each_sg(data->sg, sg, data->sg_len, i) { >> - void *buf = kmap_atomic(sg_page(sg) + sg->offset; >> + void *buf = kmap_atomic(sg_page(sg) + sg->offset); >> buffer_swap32(buf, sg->length); >> kunmap_atomic(buf); >> + } >> } >> #else >> static inline void mxcmci_swap_buffers(struct mmc_data *data) {} >> -- >> 2.17.1 >> >> >> -- >> Kees Cook >> Pixel Security -- Kees Cook Pixel Security -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html