git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: serial: ch341: fix open error handling
[pandora-kernel.git]
/
kernel
/
sysctl_binary.c
diff --git
a/kernel/sysctl_binary.c
b/kernel/sysctl_binary.c
index
6318b51
..
cd2ea02
100644
(file)
--- 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;
/* Convert the decnet address to binary */
result = -EIO;
- nodep = strchr(buf, '.')
+ 1
;
+ nodep = strchr(buf, '.');
if (!nodep)
goto out;
if (!nodep)
goto out;
+ ++nodep;
area = simple_strtoul(buf, NULL, 10);
node = simple_strtoul(nodep, NULL, 10);
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;
}
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;
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:
fput(file);
out_putname:
- putname(pathname);
+
__
putname(pathname);
out:
return result;
}
out:
return result;
}