From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Tue, 15 Mar 2011 21:55:49 +0000 (-0700)
Subject: Phonet: fix aligned-mode pipe socket buffer header reserve
X-Git-Tag: v2.6.39-rc1~468^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=638be344593b66ccca6802c6076a5b3d9200829d;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index 68e635f11de..f17fd841f94 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -1055,7 +1055,7 @@ static int pep_sendmsg(struct kiocb *iocb, struct sock *sk,
 	if (!skb)
 		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);
 	if (err < 0)
 		goto outfree;