diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2011-03-15 14:55:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 14:55:49 -0700 |
| commit | 638be344593b66ccca6802c6076a5b3d9200829d (patch) | |
| tree | 41a285f44792037362bc4efaf938b73999b76bd1 /net/phonet | |
| parent | bfd823bd74333615783d8108889814c6d82f2ab0 (diff) | |
| download | linux-3.10-638be344593b66ccca6802c6076a5b3d9200829d.tar.gz linux-3.10-638be344593b66ccca6802c6076a5b3d9200829d.tar.bz2 linux-3.10-638be344593b66ccca6802c6076a5b3d9200829d.zip | |
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>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/pep.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |