Commit f9e69345 authored Jan 30, 2009 by Sebastiano Di Paola Committed by David S. Miller Feb 01, 2009

net: packet socket packet_lookup_frame fix



packet_lookup_frames() fails to get user frame if current frame header
status contains extra flags.
This is due to the wrong assumption on the operators precedence during
frame status tests.
Fixed by forcing the right operators precedence order with explicit brackets.

Signed-off-by: Paolo Abeni <paolo.abeni@gmail.com>
Signed-off-by: Sebastiano Di Paola <sebastiano.dipaola@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5d0932a5

net/packet/af_packet.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -222,13 +222,13 @@ static void packet_lookup_frame(struct packet_sock po, unsigned int position,
		h.raw = po->pg_vec[pg_vec_pos] + (frame_offset * po->frame_size);
		switch (po->tp_version) {
		case TPACKET_V1:
		if (status != h.h1->tp_status ? TP_STATUS_USER :
		TP_STATUS_KERNEL)
		if (status != (h.h1->tp_status ? TP_STATUS_USER :
		TP_STATUS_KERNEL))
		return NULL;
		break;
		case TPACKET_V2:
		if (status != h.h2->tp_status ? TP_STATUS_USER :
		TP_STATUS_KERNEL)
		if (status != (h.h2->tp_status ? TP_STATUS_USER :
		TP_STATUS_KERNEL))
		return NULL;
		break;
		}

Admin message