summaryrefslogtreecommitdiff
path: root/pkt_buff.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-07-21 11:38:38 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-07-21 11:38:38 +0200
commitf4024343a161f50b73f106dd3dea24d68a934d5a (patch)
treedf923660ac468be24040ff3bbc7136b82e17551c /pkt_buff.h
parent820d8f23af148240e0266967ee460098a4855d94 (diff)
netsniff-ng: dissector_sll: Remove NULL check alltogether
The check for pkt being NULL is not needed since the packet is allocated in dissector_entry_point() and panic()'s if the allocation fails. pkt->sll is also guaranteed to be non-NULL by all call sites of dissector_entry_point(). This is the proper fix for CIDs 1312074 and 1312075. Noticed-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'pkt_buff.h')
0 files changed, 0 insertions, 0 deletions
iv>
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/af_nfc.c')