X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsocket.c;h=6f2a178819726b7b878aa22a6d79954b61c1e239;hb=0928d6ef7f204979749fb241a90a04a35dae133a;hp=6b7c3b51a7c12ab6ecc160cc08cda83dbb2a9a9c;hpb=7063e6c717f6108c4b3fc3135a516c86ef944870;p=linux-2.6 diff --git a/net/socket.c b/net/socket.c index 6b7c3b51a7..6f2a178819 100644 --- a/net/socket.c +++ b/net/socket.c @@ -383,9 +383,8 @@ int sock_map_fd(struct socket *sock) goto out; } - sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); + this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); this.name = name; - this.len = strlen(name); this.hash = SOCK_INODE(sock)->i_ino; file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); @@ -1908,7 +1907,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args) if (copy_from_user(a, args, nargs[call])) return -EFAULT; - err = audit_socketcall(nargs[call]/sizeof(unsigned long), args); + err = audit_socketcall(nargs[call]/sizeof(unsigned long), a); if (err) return err;