diff --git a/[refs] b/[refs] index a267cc982d21..b3eacafa9966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d8a041b7bfe1097af21441cb77d6af95f4f4680 +refs/heads/master: 43da5f2e0d0c69ded3d51907d9552310a6b545e8 diff --git a/trunk/net/socket.c b/trunk/net/socket.c index dfe5b66c97e0..a5471f804d99 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -2657,6 +2657,7 @@ static int dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32) if (copy_from_user(&ifc32, uifc32, sizeof(struct compat_ifconf))) return -EFAULT; + memset(&ifc, 0, sizeof(ifc)); if (ifc32.ifcbuf == 0) { ifc32.ifc_len = 0; ifc.ifc_len = 0;