Commit 638be344 authored Mar 15, 2011 by Rémi Denis-Courmont Committed by David S. Miller Mar 15, 2011

Phonet: fix aligned-mode pipe socket buffer header reserve



When the pipe uses aligned-mode data packets, we must reserve 4 bytes
instead of 3 for the pipe protocol header. Otherwise the Phonet header
would not be aligned, resulting in potentially corrupted headers with
later unaligned memory writes.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bfd823bd

net/phonet/pep.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1055,7 +1055,7 @@ static int pep_sendmsg(struct kiocb iocb, struct sock sk,
	if (!skb)		if (!skb)
	return err;		return err;

	skb_reserve(skb, MAX_PHONET_HEADER + 3);		skb_reserve(skb, MAX_PHONET_HEADER + 3 + pn->aligned);
	err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);		err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
	if (err < 0)		if (err < 0)
	goto outfree;		goto outfree;