X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fatm%2Fpppoatm.c;h=19d5dfc0702f2477447e4f228801e64794d7e68f;hb=6837a8c352efcc5efc70424e9bfd94ff9bfa9a47;hp=76a7d8ff6c0e79f5ed940b76a514f1a53af464eb;hpb=71bc7bf045262e82c645cad48fd56dd17e75344e;p=linux-2.6

diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 76a7d8ff6c..19d5dfc070 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -287,10 +287,9 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
 	if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
 	    be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC)
 		return -EINVAL;
-	pvcc = kmalloc(sizeof(*pvcc), GFP_KERNEL);
+	pvcc = kzalloc(sizeof(*pvcc), GFP_KERNEL);
 	if (pvcc == NULL)
 		return -ENOMEM;
-	memset(pvcc, 0, sizeof(*pvcc));
 	pvcc->atmvcc = atmvcc;
 	pvcc->old_push = atmvcc->push;
 	pvcc->old_pop = atmvcc->pop;