diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:25 -0400 |
| commit | 48cb37bd9e053429aacb7c2726da3300aba60c68 (patch) | |
| tree | b96346400d0d36557d683bc1535ed5139f9ca76d /net/unix/af_unix.c | |
| parent | e36fcd8ae611b91f0bbaf6063b0b98e1ef955880 (diff) | |
| parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
| download | kernel-crypto-48cb37bd9e053429aacb7c2726da3300aba60c68.tar.gz kernel-crypto-48cb37bd9e053429aacb7c2726da3300aba60c68.tar.xz kernel-crypto-48cb37bd9e053429aacb7c2726da3300aba60c68.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index f70475bfb62..6f290927926 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -663,11 +663,10 @@ static int unix_autobind(struct socket *sock) goto out; err = -ENOMEM; - addr = kmalloc(sizeof(*addr) + sizeof(short) + 16, GFP_KERNEL); + addr = kzalloc(sizeof(*addr) + sizeof(short) + 16, GFP_KERNEL); if (!addr) goto out; - memset(addr, 0, sizeof(*addr) + sizeof(short) + 16); addr->name->sun_family = AF_UNIX; atomic_set(&addr->refcnt, 1); |