From patchwork Thu Sep 22 12:55:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yotam Gigi X-Patchwork-Id: 673372 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 3sfxdj1KfKz9t25 for ; Thu, 22 Sep 2016 23:08:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b=hH7MKUtV; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933460AbcIVNIx (ORCPT ); Thu, 22 Sep 2016 09:08:53 -0400 Received: from mail-db5eur01on0079.outbound.protection.outlook.com ([104.47.2.79]:35424 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752165AbcIVNIv (ORCPT ); Thu, 22 Sep 2016 09:08:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=RfUC9er2MgTU7anQvBuOWzVQ3AD69AHSgivo7pTDGQo=; b=hH7MKUtV37Fp5R6cB/4x86yh2s7cuIHwg6f+G9jqrDkmgUXOhfAQT77F5A2MqsT3Zxl/QkdUrOe94KOTte52ghG302ww4Ssdti7hbTuD5zFSQjR6ElAg7oui5Rw1G0ygE03CgeEJj7/9kkxstWe0OjgazPErdiqETxwc88vPbIM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yotamg@mellanox.com; Received: from dev-r-vrt-155.mtr.labs.mlnx (193.47.165.251) by AM2PR05MB0753.eurprd05.prod.outlook.com (10.161.21.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8; Thu, 22 Sep 2016 12:53:23 +0000 From: Yotam Gigi To: , , CC: Yotam Gigi Subject: [PATCH net 1/2] act_ife: Fix external mac header on encode Date: Thu, 22 Sep 2016 15:55:25 +0300 Message-ID: <1474548926-22815-2-git-send-email-yotamg@mellanox.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1474548926-22815-1-git-send-email-yotamg@mellanox.com> References: <1474548926-22815-1-git-send-email-yotamg@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AMSPR02CA0051.eurprd02.prod.outlook.com (10.242.225.179) To AM2PR05MB0753.eurprd05.prod.outlook.com (10.161.21.139) X-MS-Office365-Filtering-Correlation-Id: 388843af-e44c-48bb-bc87-08d3e2e7704b X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB0753; 2:0pqrVxo2zBpkvx3adNC2FReq6W3tRd/Lygm4bMKoIV/BYKfQLM9+nIpDVbY8r4X0PZ+KYelyD+gKsQmriMNoNRaBAcciORRA7PIXL4X4gd+LabmQ5HvQklxwnAri/aFrCQqLlS+SSvuzdMafw7dIhZ6gML0A3fjw/KdCK/uI4ksZpxRkuG/ioe18AiJUrKfq; 3:Dqlf68++YC7UnXy+eJ1QTIXj9ytrk1OIPPTKBrUr0FC6UcCux60prwZW9AXOrHcjp42DiDiXrvzknohSUDdZNlzPs6BltdGRrE6L0N3Z3qEEAfJMy0SSaa12JmWOJznD; 25:2ezBUiEA5R128+kN9Zjg2GaE1Bxtkh9afhDEpTXlGxbxYtGVehTQfLHX7rv45Qgn749pckmmHOOdFvJS4emByaokKz7ezoNOAzkDV6iIntilIJimeiuz0WyeSdWYUCcLJK8Lucw5BgJwVsaUCNe1ZRIzyiZ2c/idghsx/pVGEsaMMZyET0Mt3JGtMW+X+8OUa7Zc0ZKCv2bqV6sgAatwlz16CKxuT8yVo09SASBnUS0TdEa0LXoshFzs+mrqSRu/wrx4y8JOIx+UvhMDDKgZO+LJP82U0VnU7HwjP7LbF8fJ+YNMzjXhTO06wuzpbP9du19ORncCbnkBCZSCjrzvdlsRtzqMr4WYAqJLrT9FwtOdsdBoySmAAfg/5XDFjnRXOlMVHANzhR2U6TcxuQAgTRWRhCecZAtRCcsIPxLBWJw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR05MB0753; X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB0753; 31:P+foJTDgnz+RK74tgL3C9VVLIQkD7K7N+r4obMxAICfjsx+xChhs6hPTJjwPMmDECn79fJm6oLAWoD+UWKMxHmjgsFku/oXI59b/CFTg1h432LllypXC2uzXiBc9Hw9aYKCmxArkMVTXBzF/neqOMsH7YC4EsLbWiWgq+ehxZgEeyFLLhm8NlI7lrcsyJo+3T9g1mXlnE03rXsgJbIHEpNJcTs9Wy1QIIkTme+R6Ie8=; 20:riYA4pWbQIUlZ3dqsckgse/3PhdaiyT0R9lpqlUFEp0/SKhfCqfo0zpJsRToias9Z3bIFiHHB2X2ZajlQT/Rix4Cyn8hqkzf6qBNkH/SKRvSQNlmjXyp88Aq+uFNpB+m7eisl1PEgzTib+x/5QhOTsiKj46esloITzjgnVFe5B89gwUu5ZMfqhPEZ9aD11JdPwbEZZvilMsF4qRqb/6ALJFYYzn+uetqF8qSxKR/59aEJjXUAr1za+f9WmDNm8ZwzpmGvGfr80mBeAhhzvw606ABzx9BR9ymJAXO11AcZ5+o9VILX4zOxrtL/THtzpRNHEKrniDIfibkkY4qckmPHXN+Mk1fhq6hTS+KnKOxxj8CjSogxTF+lAHxG0cQVUQSoWsBuxMVjvDXJa3wlO3QfHWIis+/0ZeXN9Nb3C87US/UNgmE9OVCkkriz6Sbp4tpj2iQ5K3oOiiSwOaKpfV0XidD4C1t4hgoFHQ+h9jh6cMmqhzScMQxaA2LWkENzrgf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:AM2PR05MB0753; BCL:0; PCL:0; RULEID:; SRVR:AM2PR05MB0753; X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB0753; 4:4r9GZ09/2AOSUBeG/lg7dnNoaRtIWjE6HAPrmZSwS1Dvz2mvkvmoT6JVFmwiHjCzxzBANXvx+JotcJ0DessRzu4nBA9azYz22+mBKICaQfCIhqUQeNRZ83FxTXyFGc8A45ltf3wc3coyBYbKUXnfgKqJLKCbLaPrbr9iH8xp7ohM2H3s9k1YiNXNTG9u5Nf2k7gGBYe6Kdl3EZzTCZnYHA89UEJXWNrrxal7XF9dWaAKKo/OqeXrFC+lZ2ChoIVJRJzh+XhyikP6tJSpoqiwTXo1tfc5hceMCFO59sj/ePveycUViwcRe+7E/hVmUf80XEx72w3T7uxogMQ2Y7xl8rPV3BkNeesk9m7mfjbSRCUAFRk9TlRsOsSX5hVNQ3qZN3OV+EEDo+NClmpatkukvg== X-Forefront-PRVS: 0073BFEF03 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(3846002)(86362001)(36756003)(92566002)(77096005)(5003940100001)(50466002)(19580395003)(48376002)(19580405001)(4326007)(42186005)(5660300001)(105586002)(68736007)(229853001)(106356001)(2201001)(33646002)(7736002)(305945005)(81166006)(81156014)(189998001)(4001430100002)(7846002)(586003)(6116002)(50986999)(107886002)(8676002)(47776003)(97736004)(101416001)(2906002)(2950100001)(5001770100001)(76176999)(50226002)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR05MB0753; H:dev-r-vrt-155.mtr.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR05MB0753; 23:MshtQrGuoobfTIIZCu5CQNuWSfDRLZRtZRmcv1glS?= =?us-ascii?Q?fxdmZt1NKySXOciamG0mieo6qNpxUxY2eaWqEHImcJRtdgg/At7lYNo1hlZi?= =?us-ascii?Q?0YKAteGSyhsPTGE+jDQLuwJVDgl1FoSp/FqcU0ftbHA1mWUKZotVBF7Qqg27?= =?us-ascii?Q?5UdxufWO7rI208nOhsAPHhPQ8ykGgKoXSRuFmuZzkYZQQgaq1Qj29dHbL80P?= =?us-ascii?Q?nbqckWP/FQhhod05Jpw7ctfnysEr6gR06L1x4sZa7tqwOnm8VlbrcRnareCa?= =?us-ascii?Q?mwDmGNatyY5SnYZPmP0A8QvyxWRnpz6yKo3JVar7Pk/Uj5iw656aIMCNsvrM?= =?us-ascii?Q?0v8NsvUzK1D9JBCoi0OmBTpYo5zPExChvdQLII8s604zBlSBz1v9sgceb5mb?= =?us-ascii?Q?z+OuDlW9Rh1aQ0wN2gj+oi0i6LV0wE1Ea9vDoDwdY1jNYRnayuZps2wvDsoE?= =?us-ascii?Q?gDZHl1U1wwA9Q+c+F1Kgf6kJ5Y7xQd+oP1iQIz+lMbVNUweggCSiOpEPakbo?= =?us-ascii?Q?BmNUJhDeYLj2b9zDVFK1oLEpC2wVtJe1St/McCow6ktDw61G8Gc7D6lIC7du?= =?us-ascii?Q?VdgvBwk7SHalnB06QrB1NsB9FLbysUP7aflFTcRi2TC7/hRBCXCZJAcd76hA?= =?us-ascii?Q?l00QmYAj6WdIfLwe+ZaUxSZlO+cAPg5UrfcHLL3MqkVRzreMrgII4kp/1uGJ?= =?us-ascii?Q?WdmWKxTohmZhhN91pHR983NmZYwr5DqcjCFoj3xZvJnBzRq+/WY5gVShZ/At?= =?us-ascii?Q?D0TbVR6r8ouSNnMu/7DtwFsSh0ddLC8/zRa6bfje437CkRmkSyQ6HBlkhZye?= =?us-ascii?Q?qNu9OEbZ4oi/Vb0Kvx52e8PSbQCy+Y1C/PJ/RzM0aMNqixKrGuA8UZMoDpkW?= =?us-ascii?Q?lOi9sA8nCSbwLt32A/Q+Oi5/H83PkTw7heUwRsUlLDLzVFAdC3tInGXB7wEw?= =?us-ascii?Q?q8cYoResMrFhVfnepid0pFTgdamXyN7o3BmEXsen1pKwoQ1OvhT+fUpkLNHz?= =?us-ascii?Q?G8++mCaZ6hjA955d8Y4Y+xUC0Et7GMeGZcRxi76HFhEf+qLH7NPW9YotimJT?= =?us-ascii?Q?53A5oQeY1P7EOjjXTbwsuSRxk1A8al2YPYO8LR62ijRDcWCV7nrEpWuA2p9C?= =?us-ascii?Q?Tezmh59y1SzW8h2I1RszGP7yyDrQj8fDAmrxjSIXtYM4fFKJzy7Ow=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB0753; 6:ehzab6ylVLAle8iHBVbLGh1mhtbArhjSJ/xfJ5+evFzk2/kns5L7vhBARMlQaAeSCPyqD9NFoUlJB0w1jT0lR02/X95uPat+T1jQWVpEotHFBLRlw4OxKtdtAZHBko/+4HJYJwfxc77LIFHKfmD60F/zXZTldlunw5/SqjjXwPsbFUngO1PwfnduV0naDJxXaTyGNetT/8QoBD/+YbWo10sNiJtwZX7IS6pYn0zmif4aRQ+sLLezck1H33nWJ3AlqEWN92QYektKW1wd7OKmvbe5nrdPuJjz7SqHrncuUqEXU6O5hBGXPFscbwtBqg9Adv88gwgxb+Q1nWBQXb3XZg==; 5:N6oCl3bkrGLxa50MnQ1RmTw4nx9TRpnswk6ZAK4wHHGn1dRsszAztICV9vmbKSIJ6GHczBUgggZ1xo5sP5wdal2/8ILpVYQFz/SvgDezeBF/1jIonVM6Bg1BA3/hnyhs8q3VuWuMsPkGOUYI08xs9Q==; 24:gGYOSTOabUTE2t2jD4fiJhd1RY/QB3APjAt1BobmBDYlt4Ynd16M6abXQxIbj8C/c3wir+skfmdhTYu3LCHkGSxImLqEdNBDTq5gMSQO9lg=; 7:gdsjs6zj/2S8Zvy6mFEdO/xzmXoZ3PMQPMjdP8ull7ZPv8dhTzMiHZEbXomtavYU4E2E5zNcFcfIEfDded0rerX0L7AwqdwwuqScDxcOcmEd0kV3/i2lkCRxb1v8clJvK0W51WjFqzBpADkOXN/1ZRRW5jGKlDSdRBdhiuIgmNod36fjBS1n6M1NrYFYJL7h/kvoqjkcTHXZ2ce539bT5mg5c6CWfh/KmrQEYp91C/5Iu0E4J/uNRSQwlDz0jXSn/rvRuXO7cb13c4pYqD5x3tQmajvvoQOk7hMLtPZprn1Gn73eZ/30m5Ylfx2Sk2JH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2016 12:53:23.4753 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR05MB0753 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On ife encode side, external mac header is copied from the original packet and may be overridden if the user requests. Before, the mac header copy was done from memory region that might not be accessible anymore, as skb_cow_head might free it and copy the packet. This led to random values in the external mac header once the values were not set by user. This fix takes the internal mac header from the packet, after the call to skb_cow_head. Fixes: ef6980b6becb ("net sched: introduce IFE action") Signed-off-by: Yotam Gigi --- net/sched/act_ife.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 27b19ca..7f71a3d 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -758,8 +758,6 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a, return TC_ACT_SHOT; } - iethh = eth_hdr(skb); - err = skb_cow_head(skb, reserve); if (unlikely(err)) { ife->tcf_qstats.drops++; @@ -768,6 +766,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a, } __skb_push(skb, total_push); + iethh = (struct ethhdr *)(skb->data + hdrm); memcpy(skb->data, iethh, skb->mac_len); skb_reset_mac_header(skb); skboff += skb->mac_len;