From patchwork Tue Oct 21 14:06:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 401509 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 009EA14007F for ; Wed, 22 Oct 2014 01:06:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932631AbaJUOGc (ORCPT ); Tue, 21 Oct 2014 10:06:32 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:52214 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932442AbaJUOGb (ORCPT ); Tue, 21 Oct 2014 10:06:31 -0400 Received: by mail-wi0-f175.google.com with SMTP id d1so10212949wiv.14 for ; Tue, 21 Oct 2014 07:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=0+oFlKqIFUWPvTLCpneLNMV6dUzgK1FqVfyduHNQrXM=; b=lKymJiirFQEUUXGQwi+dcREYUn1egNoQnTIfmTuXLWT7OiaFxQjMSo9GC3XrvW4ZdX krcxxxpGvqMsCTLjMUnJZjPPjwPd4Wcmm7MztVB2ng8GAvHiifTjAfLalD+cLVVnu0p3 NTEZAwzOTebW70DCJm/0TBwvwv6K5iEQLbaO9lCrbzEoU0pdsZAgU3TJ0KUhEaUbBHvN dtqHvz78B/HdP1kvXQywD82iyUmaMquybwEWzMR8B2YMXKgxHoXZubXDBVTpZKgy2QJV coeK3t8YfPjynzMqQA6/7i+LVzLG82NThlFYUq27Ybj5GprIVhvdBV667COS+/6EBpEG n+cg== X-Received: by 10.180.206.47 with SMTP id ll15mr29633129wic.67.1413900387638; Tue, 21 Oct 2014 07:06:27 -0700 (PDT) Received: from magnum.frso.rivierawaves.com ([91.151.119.162]) by mx.google.com with ESMTPSA id ex6sm15502767wjb.20.2014.10.21.07.06.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Oct 2014 07:06:26 -0700 (PDT) From: Karl Beldan To: "David S. Miller" Cc: netdev@vger.kernel.org, Karl Beldan , Ezequiel Garcia Subject: [PATCH] net: tso: fix unaligned access to crafted TCP header in helper API Date: Tue, 21 Oct 2014 16:06:05 +0200 Message-Id: <1413900365-12289-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 2.0.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Karl Beldan The crafted header start address is from a driver supplied buffer, which one can reasonably expect to be aligned on a 4-bytes boundary. However ATM the TSO helper API is only used by ethernet drivers and the tcp header will then be aligned to a 2-bytes only boundary from the header start address. Signed-off-by: Karl Beldan Cc: Ezequiel Garcia --- net/core/tso.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/tso.c b/net/core/tso.c index 8c3203c..630b30b 100644 --- a/net/core/tso.c +++ b/net/core/tso.c @@ -1,6 +1,7 @@ #include #include #include +#include /* Calculate expected number of TX descriptors */ int tso_count_descs(struct sk_buff *skb) @@ -23,7 +24,7 @@ void tso_build_hdr(struct sk_buff *skb, char *hdr, struct tso_t *tso, iph->id = htons(tso->ip_id); iph->tot_len = htons(size + hdr_len - mac_hdr_len); tcph = (struct tcphdr *)(hdr + skb_transport_offset(skb)); - tcph->seq = htonl(tso->tcp_seq); + put_unaligned_be32(tso->tcp_seq, &tcph->seq); tso->ip_id++; if (!is_last) {