From: Dan Streetman <ddstreet@ieee.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Haren Myneni <haren@linux.vnet.ibm.com>,
linux-next@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kernel <linux-kernel@vger.kernel.org>,
Dan Streetman <ddstreet@ieee.org>
Subject: [PATCH] crypto: 842 - remove WARN inside printk
Date: Mon, 21 Dec 2015 12:52:10 -0500 [thread overview]
Message-ID: <1450720330-30676-1-git-send-email-ddstreet@ieee.org> (raw)
In-Reply-To: <5671C83C.7@infradead.org>
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>
---
lib/842/842_decompress.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/842/842_decompress.c b/lib/842/842_decompress.c
index 8881dad..a7f278d 100644
--- a/lib/842/842_decompress.c
+++ b/lib/842/842_decompress.c
@@ -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,10 +202,14 @@ static int __do_index(struct sw842_param *p, u8 size, u8 bits, u64 fsize)
return -EINVAL;
}
- 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,
- (unsigned long)beN_to_cpu(&p->ostart[offset], size));
+ 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,
+ (unsigned long)beN_to_cpu(&p->ostart[offset], size));
memcpy(p->out, &p->ostart[offset], size);
p->out += size;
--
2.5.0
next prev parent reply other threads:[~2015-12-21 17:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 5:43 linux-next: Tree for Dec 16 Stephen Rothwell
2015-12-16 19:28 ` linux-next: Tree for Dec 16 (gpu/drm/vc4) Randy Dunlap
2015-12-17 0:42 ` Eric Anholt
2015-12-16 20:23 ` linux-next: Tree for Dec 16 (lib/842/842_decompress) Randy Dunlap
2015-12-18 14:32 ` Dan Streetman
2015-12-18 16:08 ` Randy Dunlap
2015-12-21 17:12 ` Dan Streetman
2015-12-21 17:52 ` Dan Streetman [this message]
2015-12-23 10:25 ` [PATCH] crypto: 842 - remove WARN inside printk Herbert Xu
2015-12-16 21:05 ` linux-next: Tree for Dec 16 (i2c/busses/i2c-emev2) Randy Dunlap
2015-12-16 21:18 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450720330-30676-1-git-send-email-ddstreet@ieee.org \
--to=ddstreet@ieee.org \
--cc=haren@linux.vnet.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).