git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rose: limit sk_filter trim to payload
[pandora-kernel.git]
/
net
/
rose
/
rose_in.c
diff --git
a/net/rose/rose_in.c
b/net/rose/rose_in.c
index
7f7fcb4
..
e5029c5
100644
(file)
--- a/
net/rose/rose_in.c
+++ b/
net/rose/rose_in.c
@@
-165,7
+165,8
@@
static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety
rose_frames_acked(sk, nr);
if (ns == rose->vr) {
rose_start_idletimer(sk);
rose_frames_acked(sk, nr);
if (ns == rose->vr) {
rose_start_idletimer(sk);
- if (sock_queue_rcv_skb(sk, skb) == 0) {
+ if (sk_filter_trim_cap(sk, skb, ROSE_MIN_LEN) == 0 &&
+ __sock_queue_rcv_skb(sk, skb) == 0) {
rose->vr = (rose->vr + 1) % ROSE_MODULUS;
queued = 1;
} else {
rose->vr = (rose->vr + 1) % ROSE_MODULUS;
queued = 1;
} else {