From: Xin Long <lucien.xin@gmail.com> Date: 2016-08-07 06:15:20
Commit 52253db924d1 ("sctp: also point GSO head_skb to the sk when
it's available") used event->chunk->head_skb to get the head_skb in
sctp_ulpevent_set_owner().
But at that moment, the event->chunk was NULL, as it cloned the skb
in sctp_ulpevent_make_rcvmsg(). Therefore, that patch didn't really
work.
This patch is to move the event->chunk initialization before calling
sctp_ulpevent_receive_data() so that it uses event->chunk when it's
valid.
Fixes: 52253db924d1 ("sctp: also point GSO head_skb to the sk when it's available")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/sctp/ulpevent.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -702,14 +702,14 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,*/sctp_ulpevent_init(event,0,skb->len+sizeof(structsk_buff));-sctp_ulpevent_receive_data(event,asoc);-/* And hold the chunk as we need it for getting the IP headers*laterinrecvmsg*/sctp_chunk_hold(chunk);event->chunk=chunk;+sctp_ulpevent_receive_data(event,asoc);+event->stream=ntohs(chunk->subh.data_hdr->stream);event->ssn=ntohs(chunk->subh.data_hdr->ssn);event->ppid=chunk->subh.data_hdr->ppid;
On Sun, Aug 07, 2016 at 02:15:13PM +0800, Xin Long wrote:
Commit 52253db924d1 ("sctp: also point GSO head_skb to the sk when
it's available") used event->chunk->head_skb to get the head_skb in
sctp_ulpevent_set_owner().
But at that moment, the event->chunk was NULL, as it cloned the skb
in sctp_ulpevent_make_rcvmsg(). Therefore, that patch didn't really
work.
This patch is to move the event->chunk initialization before calling
sctp_ulpevent_receive_data() so that it uses event->chunk when it's
valid.
Fixes: 52253db924d1 ("sctp: also point GSO head_skb to the sk when it's available")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
@@ -702,14 +702,14 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,*/sctp_ulpevent_init(event,0,skb->len+sizeof(structsk_buff));-sctp_ulpevent_receive_data(event,asoc);-/* And hold the chunk as we need it for getting the IP headers*laterinrecvmsg*/sctp_chunk_hold(chunk);event->chunk=chunk;+sctp_ulpevent_receive_data(event,asoc);+event->stream=ntohs(chunk->subh.data_hdr->stream);event->ssn=ntohs(chunk->subh.data_hdr->ssn);event->ppid=chunk->subh.data_hdr->ppid;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Neil Horman <nhorman@tuxdriver.com> Date: 2016-08-08 13:48:27
On Sun, Aug 07, 2016 at 02:15:13PM +0800, Xin Long wrote:
quoted hunk
Commit 52253db924d1 ("sctp: also point GSO head_skb to the sk when
it's available") used event->chunk->head_skb to get the head_skb in
sctp_ulpevent_set_owner().
But at that moment, the event->chunk was NULL, as it cloned the skb
in sctp_ulpevent_make_rcvmsg(). Therefore, that patch didn't really
work.
This patch is to move the event->chunk initialization before calling
sctp_ulpevent_receive_data() so that it uses event->chunk when it's
valid.
Fixes: 52253db924d1 ("sctp: also point GSO head_skb to the sk when it's available")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/sctp/ulpevent.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -702,14 +702,14 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,*/sctp_ulpevent_init(event,0,skb->len+sizeof(structsk_buff));-sctp_ulpevent_receive_data(event,asoc);-/* And hold the chunk as we need it for getting the IP headers*laterinrecvmsg*/sctp_chunk_hold(chunk);event->chunk=chunk;+sctp_ulpevent_receive_data(event,asoc);+event->stream=ntohs(chunk->subh.data_hdr->stream);event->ssn=ntohs(chunk->subh.data_hdr->ssn);event->ppid=chunk->subh.data_hdr->ppid;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: 2016-08-08 21:34:04
From: Xin Long <lucien.xin@gmail.com>
Date: Sun, 7 Aug 2016 14:15:13 +0800
Commit 52253db924d1 ("sctp: also point GSO head_skb to the sk when
it's available") used event->chunk->head_skb to get the head_skb in
sctp_ulpevent_set_owner().
But at that moment, the event->chunk was NULL, as it cloned the skb
in sctp_ulpevent_make_rcvmsg(). Therefore, that patch didn't really
work.
This patch is to move the event->chunk initialization before calling
sctp_ulpevent_receive_data() so that it uses event->chunk when it's
valid.
Fixes: 52253db924d1 ("sctp: also point GSO head_skb to the sk when it's available")
Signed-off-by: Xin Long <lucien.xin@gmail.com>