From: "Jorge Boncompte [DTI2]" <jorge@xxxxxxxx>
- Consolidates log messages, prints PPP unit number where available.
- Changes error or warning messages to correct log level.
- Uses *_ratelimited() functions for messages triggered by network packets.
- Uses pr_debug() instead of printk(KERN_DEBUG and defines DEBUG to not
change semantics for debug messages.
- Fixes one error message in mppe_compress() to print correct needed
buffer len.
- Uses %*ph for printing crypto keys, thanks to Joe Perches.
Signed-off-by: Jorge Boncompte [DTI2] <jorge@xxxxxxxx>
---
Changes from v2:
- Addressed Joe Perches review.
- Checkpatch clean.
drivers/net/ppp/ppp_mppe.c | 86 ++++++++++++++++++++------------------------
1 file changed, 39 insertions(+), 47 deletions(-)
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index f2e3d17..97989db 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -43,6 +43,8 @@
* deprecated in 2.6
*/
+#define DEBUG
+
#include <linux/err.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@ -178,7 +180,8 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
setup_sg(sg_out, state->session_key, state->keylen);
if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
state->keylen) != 0) {
- printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
+ net_warn_ratelimited("%s[%d]: crypto_blkcipher_encrypt failed\n",
+ __func__, state->unit);
}
} else {
memcpy(state->session_key, state->sha1_digest, state->keylen);
@@ -291,8 +294,7 @@ mppe_init(void *arg, unsigned char *options, int optlen, int unit, int debug,
else if (mppe_opts & MPPE_OPT_40)
state->keylen = 8;
else {
- printk(KERN_WARNING "%s[%d]: unknown key length\n", debugstr,
- unit);
+ pr_warn("%s[%d]: unknown key length\n", debugstr, unit);
return 0;
}
if (mppe_opts & MPPE_OPT_STATEFUL)
@@ -302,21 +304,13 @@ mppe_init(void *arg, unsigned char *options, int optlen, int unit, int debug,
mppe_rekey(state, 1);
if (debug) {
- int i;
- char mkey[sizeof(state->master_key) * 2 + 1];
- char skey[sizeof(state->session_key) * 2 + 1];
-
- printk(KERN_DEBUG "%s[%d]: initialized with %d-bit %s mode\n",
- debugstr, unit, (state->keylen == 16) ? 128 : 40,
- (state->stateful) ? "stateful" : "stateless");
-
- for (i = 0; i < sizeof(state->master_key); i++)
- sprintf(mkey + i * 2, "%02x", state->master_key[i]);
- for (i = 0; i < sizeof(state->session_key); i++)
- sprintf(skey + i * 2, "%02x", state->session_key[i]);
- printk(KERN_DEBUG
- "%s[%d]: keys: master: %s initial session: %s\n",
- debugstr, unit, mkey, skey);
+ pr_debug("%s[%d]: initialized with %d-bit %s mode\n",
+ debugstr, unit, (state->keylen == 16) ? 128 : 40,
+ (state->stateful) ? "stateful" : "stateless");
+ pr_debug("%s[%d]: master key: %*ph\n", debugstr, unit,
+ (int)sizeof(state->master_key), state->master_key);
+ pr_debug("%s[%d]: initial session key: %*ph\n", debugstr, unit,
+ (int)sizeof(state->session_key), state->session_key);
}
/*
@@ -387,9 +381,9 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
/* Make sure we have enough room to generate an encrypted packet. */
if (osize < isize + MPPE_OVHD + 2) {
/* Drop the packet if we should encrypt it, but can't. */
- printk(KERN_DEBUG "mppe_compress[%d]: osize too small! "
- "(have: %d need: %d)\n", state->unit,
- osize, osize + MPPE_OVHD + 2);
+ net_err_ratelimited("%s[%d]: osize too small! (have: %d need: %d)\n",
+ __func__, state->unit, osize,
+ isize + MPPE_OVHD + 2);
return -1;
}
@@ -405,8 +399,8 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE;
if (state->debug >= 7)
- printk(KERN_DEBUG "mppe_compress[%d]: ccount %d\n", state->unit,
- state->ccount);
+ pr_debug("%s[%d]: ccount %d\n", __func__, state->unit,
+ state->ccount);
put_unaligned_be16(state->ccount, obuf);
if (!state->stateful || /* stateless mode */
@@ -414,8 +408,7 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
(state->bits & MPPE_BIT_FLUSHED)) { /* CCP Reset-Request */
/* We must rekey */
if (state->debug && state->stateful)
- printk(KERN_DEBUG "mppe_compress[%d]: rekeying\n",
- state->unit);
+ pr_debug("%s[%d]: rekeying\n", __func__, state->unit);
mppe_rekey(state, 0);
state->bits |= MPPE_BIT_FLUSHED;
}
@@ -432,7 +425,8 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
setup_sg(sg_in, ibuf, isize);
setup_sg(sg_out, obuf, osize);
if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in, isize) != 0) {
- printk(KERN_DEBUG "crypto_cypher_encrypt failed\n");
+ net_err_ratelimited("%s[%d]: crypto_blkcipher_encrypt failed\n",
+ __func__, state->unit);
return -1;
}
@@ -494,9 +488,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
if (isize <= PPP_HDRLEN + MPPE_OVHD) {
if (state->debug)
- printk(KERN_DEBUG
- "mppe_decompress[%d]: short pkt (%d)\n",
- state->unit, isize);
+ pr_debug("%s[%d]: short pkt (%d)\n", __func__,
+ state->unit, isize);
return DECOMP_ERROR;
}
@@ -507,35 +500,33 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
* this is to account for possible PFC.
*/
if (osize < isize - MPPE_OVHD - 1) {
- printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "
- "(have: %d need: %d)\n", state->unit,
- osize, isize - MPPE_OVHD - 1);
+ net_warn_ratelimited("%s[%d]: osize too small! (have: %d need: %d)\n",
+ __func__, state->unit, osize,
+ isize - MPPE_OVHD - 1);
return DECOMP_ERROR;
}
osize = isize - MPPE_OVHD - 2; /* assume no PFC */
ccount = MPPE_CCOUNT(ibuf);
if (state->debug >= 7)
- printk(KERN_DEBUG "mppe_decompress[%d]: ccount %d\n",
- state->unit, ccount);
+ pr_debug("%s[%d]: ccount %d\n", __func__, state->unit, ccount);
/* sanity checks -- terminate with extreme prejudice */
if (!(MPPE_BITS(ibuf) & MPPE_BIT_ENCRYPTED)) {
- printk(KERN_DEBUG
- "mppe_decompress[%d]: ENCRYPTED bit not set!\n",
- state->unit);
+ net_warn_ratelimited("%s[%d]: ENCRYPTED bit not set!\n",
+ __func__, state->unit);
state->sanity_errors += 100;
sanity = 1;
}
if (!state->stateful && !flushed) {
- printk(KERN_DEBUG "mppe_decompress[%d]: FLUSHED bit not set in "
- "stateless mode!\n", state->unit);
+ net_warn_ratelimited("%s[%d]: FLUSHED bit not set in stateless mode!\n",
+ __func__, state->unit);
state->sanity_errors += 100;
sanity = 1;
}
if (state->stateful && ((ccount & 0xff) == 0xff) && !flushed) {
- printk(KERN_DEBUG "mppe_decompress[%d]: FLUSHED bit not set on "
- "flag packet!\n", state->unit);
+ net_warn_ratelimited("%s[%d]: FLUSHED bit not set on flag packet!\n",
+ __func__, state->unit);
state->sanity_errors += 100;
sanity = 1;
}
@@ -634,7 +625,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
setup_sg(sg_in, ibuf, 1);
setup_sg(sg_out, obuf, 1);
if (crypto_blkcipher_decrypt(&desc, sg_out, sg_in, 1) != 0) {
- printk(KERN_DEBUG "crypto_cypher_decrypt failed\n");
+ net_warn_ratelimited("%s[%d]: crypto_blkcipher_decrypt failed\n",
+ __func__, state->unit);
return DECOMP_ERROR;
}
@@ -654,7 +646,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
setup_sg(sg_in, ibuf + 1, isize - 1);
setup_sg(sg_out, obuf + 1, osize - 1);
if (crypto_blkcipher_decrypt(&desc, sg_out, sg_in, isize - 1)) {
- printk(KERN_DEBUG "crypto_cypher_decrypt failed\n");
+ net_warn_ratelimited("%s[%d]: crypto_blkcipher_decrypt failed\n",
+ __func__, state->unit);
return DECOMP_ERROR;
}
@@ -681,9 +674,8 @@ static void mppe_incomp(void *arg, unsigned char *ibuf, int icnt)
if (state->debug &&
(PPP_PROTOCOL(ibuf) >= 0x0021 && PPP_PROTOCOL(ibuf) <= 0x00fa))
- printk(KERN_DEBUG
- "mppe_incomp[%d]: incompressible (unencrypted) data! "
- "(proto %04x)\n", state->unit, PPP_PROTOCOL(ibuf));
+ pr_debug("%s[%d]: incompressible (unencrypted) data! (proto 0x%04x)\n",
+ __func__, state->unit, PPP_PROTOCOL(ibuf));
state->stats.inc_bytes += icnt;
state->stats.inc_packets++;
@@ -740,7 +732,7 @@ static int __init ppp_mppe_init(void)
answer = ppp_register_compressor(&ppp_mppe);
if (answer == 0)
- printk(KERN_INFO "PPP MPPE Compression module registered\n");
+ pr_info("PPP MPPE Compression module registered\n");
else
kfree(sha_pad);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-ppp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
