X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=kernel%2Fsysctl_binary.c;h=cd2ea02c5a9d4bb673c0d089aa231ba1ceeb75b8;hp=6318b511afa10b3044c7bbd1eb49b28f7c490fcc;hb=33703833b1402090b526a16b3acd0b5dc597a922;hpb=c9a7fe9672612c0b595633d2945f52257ad92b20 diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 6318b511afa1..cd2ea02c5a9d 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1194,9 +1194,10 @@ static ssize_t bin_dn_node_address(struct file *file, /* Convert the decnet address to binary */ result = -EIO; - nodep = strchr(buf, '.') + 1; + nodep = strchr(buf, '.'); if (!nodep) goto out; + ++nodep; area = simple_strtoul(buf, NULL, 10); node = simple_strtoul(nodep, NULL, 10); @@ -1345,7 +1346,7 @@ static ssize_t binary_sysctl(const int *name, int nlen, } mnt = current->nsproxy->pid_ns->proc_mnt; - file = file_open_root(mnt->mnt_root, mnt, pathname, flags); + file = file_open_root(mnt->mnt_root, mnt, pathname, flags, 0); result = PTR_ERR(file); if (IS_ERR(file)) goto out_putname; @@ -1354,7 +1355,7 @@ static ssize_t binary_sysctl(const int *name, int nlen, fput(file); out_putname: - putname(pathname); + __putname(pathname); out: return result; }