Pārlūkot izejas kodu

netlink: mmap: fix lookup frame position

__netlink_lookup_frame() was always called with the same "pos"
value in netlink_forward_ring(). It will look at the same ring entry
header over and over again, every time through this loop. Then cycle
through the whole ring, advancing ring->head, not "pos" until it
equals the "ring->head != head" loop test fails.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Ken-ichirou MATSUZAWA 10 gadi atpakaļ
vecāks
revīzija
7084a31589
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      net/netlink/af_netlink.c

+ 2 - 2
net/netlink/af_netlink.c

@@ -611,11 +611,11 @@ static void netlink_increment_head(struct netlink_ring *ring)
 
 
 static void netlink_forward_ring(struct netlink_ring *ring)
 static void netlink_forward_ring(struct netlink_ring *ring)
 {
 {
-	unsigned int head = ring->head, pos = head;
+	unsigned int head = ring->head;
 	const struct nl_mmap_hdr *hdr;
 	const struct nl_mmap_hdr *hdr;
 
 
 	do {
 	do {
-		hdr = __netlink_lookup_frame(ring, pos);
+		hdr = __netlink_lookup_frame(ring, ring->head);
 		if (hdr->nm_status == NL_MMAP_STATUS_UNUSED)
 		if (hdr->nm_status == NL_MMAP_STATUS_UNUSED)
 			break;
 			break;
 		if (hdr->nm_status != NL_MMAP_STATUS_SKIP)
 		if (hdr->nm_status != NL_MMAP_STATUS_SKIP)