diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /net/phonet | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/af_phonet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index f400ff168904..62af1d8a8dd2 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c | |||
| @@ -148,8 +148,8 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, | |||
| 148 | struct phonethdr *ph; | 148 | struct phonethdr *ph; |
| 149 | int err; | 149 | int err; |
| 150 | 150 | ||
| 151 | if (skb->len + 2 > 0xffff) { | 151 | if (skb->len + 2 > 0xffff /* Phonet length field limit */ || |
| 152 | /* Phonet length field would overflow */ | 152 | skb->len + sizeof(struct phonethdr) > dev->mtu) { |
| 153 | err = -EMSGSIZE; | 153 | err = -EMSGSIZE; |
| 154 | goto drop; | 154 | goto drop; |
| 155 | } | 155 | } |