leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppp_read(): switch to skb_copy_datagram_iter()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-11-24 17:48:04 -05:00
parent e5a4b0bb80
commit ba5684083c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ppp/ppp_generic.c
View File

@ -417,6 +417,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
ssize_t ret; ssize_t ret;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
struct iovec iov; struct iovec iov;
struct iov_iter to;
ret = count; ret = count;
@ -462,7 +463,8 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
ret = -EFAULT; ret = -EFAULT;
iov.iov_base = buf; iov.iov_base = buf;
iov.iov_len = count; iov.iov_len = count;
if (skb_copy_datagram_iovec(skb, 0, &iov, skb->len)) iov_iter_init(&to, READ, &iov, 1, count);
if (skb_copy_datagram_iter(skb, 0, &to, skb->len))
goto outf; goto outf;
ret = skb->len; ret = skb->len;