From: Sowmini Varadhan <sowmini.varadhan@oracle.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jbenc@redhat.com,
hannes@stressinduktion.org, aduyck@mirantis.com,
daniel@iogearbox.net, pabeni@redhat.com,
sowmini.varadhan@oracle.com
Subject: [PATCH net-next] net/vxlan: Avoid unaligned access in vxlan_build_skb()
Date: Tue, 20 Sep 2016 10:27:00 -0400 [thread overview]
Message-ID: <20160920142700.GJ8920@oracle.com> (raw)
The vxlan header is at offset (14 + 20 + 8) into the packet,
so the vxh is not aligned in vxlan_build_skb. Use [get/put]_unaligned
functions to modify flags and vni field in the vxh.
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
---
drivers/net/vxlan.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index e7d1668..f903fa4 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1751,15 +1751,17 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
goto out_free;
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
- vxh->vx_flags = VXLAN_HF_VNI;
- vxh->vx_vni = vxlan_vni_field(vni);
+ put_unaligned(VXLAN_HF_VNI, &vxh->vx_flags);
+ put_unaligned(vxlan_vni_field(vni), &vxh->vx_vni);
if (type & SKB_GSO_TUNNEL_REMCSUM) {
unsigned int start;
+ __be32 tmpvni = get_unaligned(&vxh->vx_vni);
start = skb_checksum_start_offset(skb) - sizeof(struct vxlanhdr);
- vxh->vx_vni |= vxlan_compute_rco(start, skb->csum_offset);
- vxh->vx_flags |= VXLAN_HF_RCO;
+ tmpvni |= vxlan_compute_rco(start, skb->csum_offset);
+ put_unaligned(tmpvni, &vxh->vx_vni);
+ put_unaligned(VXLAN_HF_VNI | VXLAN_HF_RCO, &vxh->vx_flags);
if (!skb_is_gso(skb)) {
skb->ip_summed = CHECKSUM_NONE;
--
1.7.1
next reply other threads:[~2016-09-20 14:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 14:27 Sowmini Varadhan [this message]
2016-09-20 15:31 ` [PATCH net-next] net/vxlan: Avoid unaligned access in vxlan_build_skb() Tom Herbert
2016-09-20 15:49 ` Sowmini Varadhan
2016-09-20 16:11 ` Jiri Benc
2016-09-20 16:31 ` Sowmini Varadhan
2016-09-20 16:43 ` Jiri Benc
2016-09-20 17:07 ` Sowmini Varadhan
2016-09-20 17:15 ` Jiri Benc
2016-09-20 17:09 ` Jiri Benc
2016-09-20 17:19 ` Tom Herbert
2016-09-20 17:24 ` Sowmini Varadhan
2016-09-22 5:52 ` David Miller
2016-09-22 21:30 ` Sowmini Varadhan
2016-09-23 12:06 ` David Miller
2016-09-23 14:17 ` Alexander Duyck
2016-09-23 17:20 ` Sowmini Varadhan
2016-09-23 17:38 ` Alexander Duyck
2016-09-23 23:41 ` Sowmini Varadhan
2016-09-24 0:43 ` Alexander Duyck
2016-09-28 17:03 ` Sowmini Varadhan
2016-09-28 18:08 ` Alexander Duyck
2016-09-28 19:56 ` Sowmini Varadhan
2016-09-20 16:45 ` Hannes Frederic Sowa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160920142700.GJ8920@oracle.com \
--to=sowmini.varadhan@oracle.com \
--cc=aduyck@mirantis.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hannes@stressinduktion.org \
--cc=jbenc@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).