Skip to content

Commit

Permalink
Staging: batman-adv: Fix skbuff leak in VIS code.
Browse files Browse the repository at this point in the history
The vis code takes a copy of the data inside the skbuf if it is interesting
for us, so we always need to release the skbuf.

Reported-by: Linus Luessing <linus.luessing@web.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andrew Lunn authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 837b824 commit 8d03847
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/staging/batman-adv/routing.c
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,6 @@ int recv_vis_packet(struct sk_buff *skb)
struct vis_packet *vis_packet;
struct ethhdr *ethhdr;
int hdr_size = sizeof(struct vis_packet);
int ret;

if (skb_headlen(skb) < hdr_size)
return NET_RX_DROP;
Expand All @@ -962,18 +961,18 @@ int recv_vis_packet(struct sk_buff *skb)
case VIS_TYPE_SERVER_SYNC:
/* TODO: handle fragmented skbs properly */
receive_server_sync_packet(vis_packet, skb_headlen(skb));
ret = NET_RX_SUCCESS;
break;

case VIS_TYPE_CLIENT_UPDATE:
/* TODO: handle fragmented skbs properly */
receive_client_update_packet(vis_packet, skb_headlen(skb));
ret = NET_RX_SUCCESS;
break;

default: /* ignore unknown packet */
ret = NET_RX_DROP;
break;
}
return ret;

/* We take a copy of the data in the packet, so we should
always free the skbuf. */
return NET_RX_DROP;
}

0 comments on commit 8d03847

Please sign in to comment.