| Message ID | 1300178222-2877-1-git-send-email-remi.denis-courmont@nokia.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Date: Tue, 15 Mar 2011 10:37:02 +0200 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 68e635f..f17fd84 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;
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> --- net/phonet/pep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)