提交 e7dfb09a 编写于 作者: P Patrick McHardy 提交者: David S. Miller

[NETFILTER]: Fix HW checksum handling in nfnetlink_queue

Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 03486a4f
...@@ -371,6 +371,12 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, ...@@ -371,6 +371,12 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
break; break;
case NFQNL_COPY_PACKET: case NFQNL_COPY_PACKET:
if (entry->skb->ip_summed == CHECKSUM_HW &&
(*errp = skb_checksum_help(entry->skb,
entry->info->outdev == NULL))) {
spin_unlock_bh(&queue->lock);
return NULL;
}
if (queue->copy_range == 0 if (queue->copy_range == 0
|| queue->copy_range > entry->skb->len) || queue->copy_range > entry->skb->len)
data_len = entry->skb->len; data_len = entry->skb->len;
...@@ -636,7 +642,7 @@ nfqnl_mangle(void *data, int data_len, struct nfqnl_queue_entry *e) ...@@ -636,7 +642,7 @@ nfqnl_mangle(void *data, int data_len, struct nfqnl_queue_entry *e)
if (!skb_make_writable(&e->skb, data_len)) if (!skb_make_writable(&e->skb, data_len))
return -ENOMEM; return -ENOMEM;
memcpy(e->skb->data, data, data_len); memcpy(e->skb->data, data, data_len);
e->skb->ip_summed = CHECKSUM_NONE;
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册