summaryrefslogtreecommitdiff
path: root/net/atm
diff options
context:
space:
mode:
authorPhil Sutter <phil.sutter@viprinet.com>2013-02-01 11:21:41 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-14 22:49:05 +0400
commitf60f85403b3a5b566ba0eaf174930f6a626d33ad (patch)
tree9adc81bec9debf7768180899b00bcf3c94be33ae /net/atm
parentd78378096e74b2fd0b42b74156ba0ae0567ea226 (diff)
downloadlinux-f60f85403b3a5b566ba0eaf174930f6a626d33ad.tar.xz
packet: fix leakage of tx_ring memory
[ Upstream commit 9665d5d62487e8e7b1f546c00e11107155384b9a ] When releasing a packet socket, the routine packet_set_ring() is reused to free rings instead of allocating them. But when calling it for the first time, it fills req->tp_block_nr with the value of rb->pg_vec_len which in the second invocation makes it bail out since req->tp_block_nr is greater zero but req->tp_block_size is zero. This patch solves the problem by passing a zeroed auto-variable to packet_set_ring() upon each invocation from packet_release(). As far as I can tell, this issue exists even since 69e3c75 (net: TX_RING and packet mmap), i.e. the original inclusion of TX ring support into af_packet, but applies only to sockets with both RX and TX ring allocated, which is probably why this was unnoticed all the time. Signed-off-by: Phil Sutter <phil.sutter@viprinet.com> Cc: Johann Baudy <johann.baudy@gnu-log.net> Cc: Daniel Borkmann <dborkman@redhat.com> Acked-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/atm')
0 files changed, 0 insertions, 0 deletions