crypto: 842 - remove WARN inside printk (5ca636b9) · Commits · 戴 / test

Remove the WARN() from the beN_to_cpu macro, which is used as a param to a pr_debug() call. With a certain kernel config, this printk-in-printk results in the no_printk() macro trying to recursively call the no_printk() macro, and since macros can't recursively call themselves a build error results. Reported-by:

Randy Dunlap <rdunlap@infradead.org> Signed-off-by:

Dan Streetman <ddstreet@ieee.org> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

lib/842/842_decompress.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ struct sw842_param {
		((s) == 2 ? be16_to_cpu(get_unaligned((__be16 *)d)) : \
		(s) == 4 ? be32_to_cpu(get_unaligned((__be32 *)d)) : \
		(s) == 8 ? be64_to_cpu(get_unaligned((__be64 *)d)) : \
		WARN(1, "pr_debug param err invalid size %x\n", s))
		0)

		static int next_bits(struct sw842_param p, u64 d, u8 n);

		@@ -202,9 +202,13 @@ static int __do_index(struct sw842_param *p, u8 size, u8 bits, u64 fsize)
		return -EINVAL;
		}

		if (size != 2 && size != 4 && size != 8)
		WARN(1, "__do_index invalid size %x\n", size);
		else
		pr_debug("index%x to %lx off %lx adjoff %lx tot %lx data %lx\n",
		size, (unsigned long)index, (unsigned long)(index * size),
		(unsigned long)offset, (unsigned long)total,
		size, (unsigned long)index,
		(unsigned long)(index * size), (unsigned long)offset,
		(unsigned long)total,
		(unsigned long)beN_to_cpu(&p->ostart[offset], size));

		memcpy(p->out, &p->ostart[offset], size);

Admin message