dev/minic: fix too long payload by 14 bytes

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

dev/minic.c

@@ -194,7 +194,7 @@ int minic_poll_rx()
 int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
 		   struct hw_timestamp *hwts)
 {
-	uint32_t payload_size, num_words;
+	uint32_t frame_size, payload_size, num_words;
 	uint32_t desc_hdr;
 	uint32_t raw_ts;
 	uint32_t cur_avail;
@@ -217,8 +217,8 @@ int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
 		}
 		return 0;
 	}
-	payload_size = RX_DESC_SIZE(desc_hdr);
-	num_words = ((payload_size + 3) >> 2) + 1;
+	frame_size = RX_DESC_SIZE(desc_hdr);
+	num_words = ((frame_size + 3) >> 2) + 1;
 
 	/* valid packet */
 	if (!RX_DESC_ERROR(desc_hdr)) {
@@ -229,15 +229,15 @@ int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
 			int cntr_diff;
 			uint16_t dhdr;
 
-			payload_size -= RX_OOB_SIZE;
+			frame_size -= RX_OOB_SIZE;
 
 			/* fixme: ugly way of doing unaligned read */
 			minic_rx_memcpy((uint8_t *) & raw_ts,
 					(uint8_t *) minic.rx_head
-					+ payload_size + 6, 4);
+					+ frame_size + 6, 4);
 			minic_rx_memcpy((uint8_t *) & dhdr,
 					(uint8_t *) minic.rx_head +
-					payload_size + 4, 2);
+					frame_size + 4, 2);
 			EXPLODE_WR_TIMESTAMP(raw_ts, counter_r, counter_f);
 
 			shw_pps_gen_get_time(&sec, &counter_ppsg);
@@ -258,14 +258,14 @@ int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
 			hwts->nsec = counter_r * (REF_CLOCK_PERIOD_PS / 1000);
 			hwts->valid = (dhdr & RXOOB_TS_INCORRECT) ? 0 : 1;
 		}
-
+		payload_size = frame_size - ETH_HEADER_SIZE;
 		n_recvd = (buf_size < payload_size ? buf_size : payload_size);
 		minic.rx_count++;
 
 		minic_rx_memcpy(hdr, (void *)minic.rx_head + 4,
 				ETH_HEADER_SIZE);
 		minic_rx_memcpy(payload, (void *)minic.rx_head + 4
-				+ ETH_HEADER_SIZE, n_recvd - ETH_HEADER_SIZE);
+				+ ETH_HEADER_SIZE, n_recvd);
 	} else {
 		n_recvd = -1;
 	}

lib/net.c

@@ -253,7 +253,7 @@ int ptpd_netif_recvfrom(struct wrpc_socket *s, struct wr_sockaddr *from, void *d
 		   q->tail, hdr.srcmac[0], hdr.srcmac[1], hdr.srcmac[2],
 		   hdr.srcmac[3], hdr.srcmac[4], hdr.srcmac[5]);
 
-	return min(size - sizeof(struct ethhdr), data_length);
+	return min(size, data_length);
 }
 
 int ptpd_netif_sendto(struct wrpc_socket * sock, struct wr_sockaddr *to, void *data,