Skip to content

Commit

Permalink
ipv4: raw_send_hdrinc(): pass msghdr
Browse files Browse the repository at this point in the history
Switch from passing msg->iov_iter.iov to passing msg itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Feb 4, 2015
1 parent a8866ff commit 7ae9abf
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/ipv4/raw.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ int raw_rcv(struct sock *sk, struct sk_buff *skb)
}

static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
void *from, size_t length,
struct msghdr *msg, size_t length,
struct rtable **rtp,
unsigned int flags)
{
Expand Down Expand Up @@ -382,7 +382,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,

skb->transport_header = skb->network_header;
err = -EFAULT;
if (memcpy_fromiovecend((void *)iph, from, 0, length))
if (memcpy_fromiovecend((void *)iph, msg->msg_iter.iov, 0, length))
goto error_free;

iphlen = iph->ihl * 4;
Expand Down Expand Up @@ -625,8 +625,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
back_from_confirm:

if (inet->hdrincl)
/* XXX: stripping const */
err = raw_send_hdrinc(sk, &fl4, (struct iovec *)msg->msg_iter.iov, len,
err = raw_send_hdrinc(sk, &fl4, msg, len,
&rt, msg->msg_flags);

else {
Expand Down

0 comments on commit 7ae9abf

Please sign in to comment.