Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / net / ppp_mppe.c

diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index 5ae80bbe2edca0dcd698960553ed493e0a6dd4d9..f79cf87a2bff555aef80eba31da6c17eb340d65c 100644 (file)
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -200,11 +200,10 @@ static void *mppe_alloc(unsigned char *options, int optlen)
            || options[0] != CI_MPPE || options[1] != CILEN_MPPE)
                goto out;
 
-       state = kmalloc(sizeof(*state), GFP_KERNEL);
+       state = kzalloc(sizeof(*state), GFP_KERNEL);
        if (state == NULL)
                goto out;
 
-       memset(state, 0, sizeof(*state));
 
        state->arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(state->arc4)) {
@@ -493,14 +492,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
 
        /*
         * Make sure we have enough room to decrypt the packet.
-        * To account for possible PFC we should only subtract 1
-        * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);
-        * However, we assume no PFC, thus subtracting 2 bytes.
+        * Note that for our test we only subtract 1 byte whereas in
+        * mppe_compress() we added 2 bytes (+MPPE_OVHD);
+        * this is to account for possible PFC.
         */
-       if (osize < isize - MPPE_OVHD - 2) {
+       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 - 2);
+                      osize, isize - MPPE_OVHD - 1);
                return DECOMP_ERROR;
        }
        osize = isize - MPPE_OVHD - 2;  /* assume no PFC */