netsniff-ng-libs = -lpthread
ifeq ($(CONFIG_LIBPCAP), 1)
netsniff-ng-libs += -lpcap
endif
ifeq ($(CONFIG_GEOIP), 1)
netsniff-ng-libs += -lGeoIP \
-lz
endif
ifeq ($(CONFIG_LIBNL), 1)
netsniff-ng-libs += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-3.0) \
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-genl-3.0) \
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-route-3.0)
endif
netsniff-ng-objs = dissector.o \
dissector_sll.o \
dissector_eth.o \
dissector_80211.o \
dissector_netlink.o \
lookup.o \
proto_arp.o \
proto_ethernet.o \
proto_icmpv4.o \
proto_icmpv6.o \
proto_igmp.o \
proto_ip_authentication_hdr.o \
proto_ip_esp.o \
proto_ipv4.o \
proto_ipv6.o \
proto_ipv6_dest_opts.o \
proto_ipv6_fragm.o \
proto_ipv6_hop_by_hop.o \
proto_ipv6_in_ipv4.o \
proto_ipv6_mobility_hdr.o \
proto_ipv6_no_nxt_hdr.o \
proto_ipv6_routing.o \
proto_lldp.o \
proto_none.o \
proto_tcp.o \
proto_udp.o \
proto_vlan.o \
proto_vlan_q_in_q.o \
proto_mpls_unicast.o \
proto_80211_mac_hdr.o \
privs.o \
proc.o \
dev.o \
str.o \
sig.o \
sock.o \
irq.o \
iosched.o \
ioops.o \
link.o \
xmalloc.o \
hash.o \
bpf.o \
pcap_rw.o \
pcap_sg.o \
pcap_mm.o \
ring_rx.o \
ring_tx.o \
ring.o \
tprintf.o \
timer.o \
die.o \
sysctl.o \
netsniff-ng.o
ifeq ($(CONFIG_LIBPCAP), 1)
netsniff-ng-objs += bpf_comp.o
endif
ifeq ($(CONFIG_GEOIP), 1)
netsniff-ng-objs += geoip.o
endif
ifeq ($(CONFIG_HWTSTAMP), 1)
netsniff-ng-objs += tstamping.o
endif
ifeq ($(CONFIG_LIBNL), 1)
netsniff-ng-objs += mac80211.o \
proto_nlmsg.o
endif
netsniff-ng-eflags = -DNEED_TCPDUMP_LIKE_FILTER
ifeq ($(CONFIG_LIBNL), 1)
netsniff-ng-eflags += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-3.0) \
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-genl-3.0) \
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-route-3.0)
endif
netsniff-ng-confs = ether.conf \
tcp.conf \
udp.conf \
oui.conf \
geoip.conf
href='/cgit.cgi/linux/net-next.git/diff/tools/virtio/virtio-trace/README?h=nds-private-remove&id=91539eb1fda2d530d3b268eef542c5414e54bf1a'>diff
dmaengine: pl330: fix double lock
The static bug finder EBA (http://www.iagoabal.eu/eba/) reported the
following double-lock bug:
Double lock:
1. spin_lock_irqsave(pch->lock, flags) at pl330_free_chan_resources:2236;
2. call to function `pl330_release_channel' immediately after;
3. call to function `dma_pl330_rqcb' in line 1753;
4. spin_lock_irqsave(pch->lock, flags) at dma_pl330_rqcb:1505.
I have fixed it as suggested by Marek Szyprowski.
First, I have replaced `pch->lock' with `pl330->lock' in functions
`pl330_alloc_chan_resources' and `pl330_free_chan_resources'. This avoids
the double-lock by acquiring a different lock than `dma_pl330_rqcb'.
NOTE that, as a result, `pl330_free_chan_resources' executes
`list_splice_tail_init' on `pch->work_list' under lock `pl330->lock',
whereas in the rest of the code `pch->work_list' is protected by
`pch->lock'. I don't know if this may cause race conditions. Similarly
`pch->cyclic' is written by `pl330_alloc_chan_resources' under
`pl330->lock' but read by `pl330_tx_submit' under `pch->lock'.
Second, I have removed locking from `pl330_request_channel' and
`pl330_release_channel' functions. Function `pl330_request_channel' is
only called from `pl330_alloc_chan_resources', so the lock is already
held. Function `pl330_release_channel' is called from
`pl330_free_chan_resources', which already holds the lock, and from
`pl330_del'. Function `pl330_del' is called in an error path of
`pl330_probe' and at the end of `pl330_remove', but I assume that there
cannot be concurrent accesses to the protected data at those points.
Signed-off-by: Iago Abal <mail@iagoabal.eu>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>