diff --git a/[refs] b/[refs] index 54aaf646bcba..cb9093b666ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8adc5465525f28be1f728b6fa600d327e1d49f55 +refs/heads/master: 4487b2f657a4d204c35a7afaa45fc8569c9069ca diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c index 24d7c9f31918..c6d71526f625 100644 --- a/trunk/net/ipv4/raw.c +++ b/trunk/net/ipv4/raw.c @@ -900,8 +900,9 @@ static int raw_seq_open(struct inode *inode, struct file *file) { struct seq_file *seq; int rc = -ENOMEM; - struct raw_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL); + struct raw_iter_state *s; + s = kzalloc(sizeof(*s), GFP_KERNEL); if (!s) goto out; rc = seq_open(file, &raw_seq_ops); @@ -910,7 +911,6 @@ static int raw_seq_open(struct inode *inode, struct file *file) seq = file->private_data; seq->private = s; - memset(s, 0, sizeof(*s)); out: return rc; out_kfree: