From patchwork Tue Jul 19 05:15:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 649924 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 3rtpCk2f64z9s0M for ; Tue, 19 Jul 2016 15:15:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=renesasgroup.onmicrosoft.com header.i=@renesasgroup.onmicrosoft.com header.b=XBJZIi2R; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752174AbcGSFPk (ORCPT ); Tue, 19 Jul 2016 01:15:40 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:27203 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752004AbcGSFPi (ORCPT ); Tue, 19 Jul 2016 01:15:38 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 19 Jul 2016 14:15:35 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id E91DE4B9EE; Tue, 19 Jul 2016 14:15:35 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id DAE721806F; Tue, 19 Jul 2016 14:15:35 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id D1B5E1800A; Tue, 19 Jul 2016 14:15:35 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id QAF14661; Tue, 19 Jul 2016 14:15:35 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="215382209" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 19 Jul 2016 14:15:34 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5JVdyPD+9kuPCx+f9fUVQVITKuOboMSi4wbF5M8E/eo=; b=XBJZIi2R4rDitpMjWSMQeNjupTJaDqp1zkPPyZbNZeQWT4tJcNiPH3KrbNCBDcu150BhQmHoPxhXLJ8e6lej4x20DB+W0res5W72A0BGioiy+2MrdBBIQQjah2aAjblOfRLR8C8EiGT1edHzVl6UK5aLiXtM06vOQCE1oowgeM8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost (211.11.155.144) by HKXPR06MB0549.apcprd06.prod.outlook.com (10.161.177.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.544.10; Tue, 19 Jul 2016 05:15:28 +0000 From: Yoshihiro Shimoda To: CC: , , , , , , , "Yoshihiro Shimoda" , Subject: [PATCH] packet: fix second argument of sock_tx_timestamp() Date: Tue, 19 Jul 2016 14:15:20 +0900 Message-ID: <1468905320-8132-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0017.jpnprd01.prod.outlook.com (10.161.131.155) To HKXPR06MB0549.apcprd06.prod.outlook.com (10.161.177.139) X-MS-Office365-Filtering-Correlation-Id: a0d5184f-7b6e-45ba-5dfa-08d3af93b2d2 X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 2:2hCc5aRQOnFge8VtPpvsXGKoR79xnI4B61gwwbRP6nDLEsYbdbj4AfQ8fYI39Y73GRahUz+a68gSc5RrE25F+OmidtJ7nKzhMbrqEH9R5RlsLkLtODMyGuS8IkNDDFA0b3Rfl7QpSkG2M1tkXv3dIRyWgetjzVOELTPzewDbGRA9i7hyoEeFYN5WyFn2PKZ2; 3:hGgi21/WPcHazOACoRiLPRCH+Ge/QVzj+ZJxi9JILnMLi2dQvClg7BZjQQ4cKVr+8XVG+IbP/5pQX+GD87o8b1VnU4SVMc1gFL2rm280JbDVP8Kx2dxRA93SUV42/kaS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB0549; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 25:Ct8G5+Obt+DUTpsu1/8b2ujEilxJmy5DL/+qYM5HCu762RHWeFhQcolUZWGhJD0ALSFhdSOPD4ji4bRaljTKQ5pfN6B+886thZpJ0hRzERbGjcOeaofXflPfecN3eIuljHrq6KO9xWOEL4iSjI02hS96SyVev1Tw9Su6r0JosPvhuGJ3sl0XRUEWwhx02QOkgpXke8Cjoo0Pb0ZLR+H96gFAei4K0ZfX0ajfwBcCahNvJbXwasjzbgXCmSRtbHW/koy8gKHjz/y6KVxY21BNGJ4fAn7Nkat9ZPgQyxC/pVlGHAGscyAQR6WFwPfLTVejuihVT/ezoKu2qWHCG/6tpfZwOUrAAAb3GU55V7ja1ZQR7w19x6/G8ty+wpcDiGbFiN6D7JMEBrQ0fLnyTIJHRy7BK357S4IfQSOYYAi0wugvcUAwT42/GZxZRJtwDhTzF8WX72+XdxlhzAkfrqZmKCykRx98XuXyAvidqIydn1Vudq+l5JDF4szR8PZu2MA2lEGwKsGnW03euy/KUISmxffeeN3YJq4xkKOoasrhCOu3TBMjDqrDxelgA85KkPehke3N/oHMxSxwkb2+TcvLGsMpo4Vjd4YP1NZIaLcWpmpmVkYyrldaI48OxvUQ5U00uz8MdfBc5mfi0JMaTRCGo+1V8G7btlvSjHrVo30BFrajQhE/HzGSs9tf35lxE38aHJXjfKee7q5JBC+yYdWvao4Jnr/v+fAY4wWT1b5fZATZkEJEIlumVd0WvJquZ+8iTpgXoOfmygDOiHOVLeChwZh3F0LlukiRiZbypuN/yHjTzHU2Wr4SlHKTmrArb0R308zdnpom1qFzgD3sAfA6lJ1m6ZpiFfRFvtrhQF0uGig= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 31:hiRYrCm2M33+AqTxIyGO/Wys5/qnJagbPGMnNHuZu+1g+vQMofd3+sgxvUxeekPQtj7BkD6V+GKnFX+IW/tmevSrIcWz5F7n69rZKInGD/AgLlQ+347zSXcJffxgfwv6Jt1ICovx4+cW2GADG59KVc5ssC+T9WKXB8l5oXSbVW/INtlTM+7t6zN9g5J6O6UcuKUCMxKKHxspSA6Ii+mHVw==; 20:xCRo4Qbwr8M/SSZQAl38c/a0sFqEUCgmREKP0eIliiATXoFKAyaARAHg6Zd2t6ASQMHq5pOsDZnwBFN6c6c+qLL8GvcwVcdkIf0pB9gyxFB47YEqO0oNhtokAHnwWsHWfcAZF8nH+nQbv23N7uTlHvBAUn2vBgR4AnP9LmujPmO/IsPTiRoRWLb1vcxcwydlfbwqOtSLB7hKr7MX53J1v47LxxJtpu1LM83nu9LGNk/1ud7DV8hfMlLhm90QmXKr3KaVl44B31oU3qMHm818+6xUQ0DEwJozF6ODUmUfFKxD9ckgYGVReAQQj55vQF58CIlHqxwuZueovkQdCIuIJ3OiJtna4qKyQv/nnh+wvhKhRDP2FshGZ+YZXyFvlCuRlCt99wRDS0xu6wEwXim2GmE9TCOqR29MHB4pXGiZ/75sGg5t+VJzRobHBoQEKAgHSF3nY6gk9bqegJxNW7yzbTve012c8+D0kDV0rxeQ65mWyn/+WcRTxJ9Qv6Y4ak6c X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:HKXPR06MB0549; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB0549; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 4:3Eraz095vAMw7iUk4sAfeBqJmFj6A5lPw57xZWLjVBJJBbBHfEfUNU5BikYKDwDjPVfcgF0eZ+RGjTfT646ia9cpADVVg5URB3asQpclJQrBcy0LqAT4JNvL75TS4L350Fx+ZOZgm4PjRkUYwZqQ1N+32VqsgVYik7W5by20PfPq5KodsixI4k5cb1K3hrENygvpzu7sTUo1JEoM5p28IKQK9LlxM+8PFiLwIiSQlG3SUyIuiYaUpmgE/eXBNVGVC1VU6accDaFiTr4yRUOnK/jX1drdSdH4WG2G8N4g3dy41unwXLLSy0ck3dKqFd+FTCm9Yeef5H/VFxmzsOs10MGm5CFLee9iDYzqBlxj0/36xbShxydPI0/Gc2IhI5obOfUAk0rqPxy2NJxVn1yVZTQ35Xf8qL1vC9fleaVOToGTddhR+fBb+IyZk7NzuhOm X-Forefront-PRVS: 000800954F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(7736002)(105586002)(6116002)(586003)(305945005)(3846002)(42186005)(50986999)(50226002)(97736004)(7846002)(50466002)(19580395003)(68736007)(76506005)(19580405001)(8676002)(81156014)(81166006)(101416001)(189998001)(4326007)(2906002)(78352004)(92566002)(110136002)(66066001)(47776003)(106356001)(5003940100001)(77096005)(48376002)(36756003)(229853001)(15975445007)(33646002)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB0549; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:0; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB0549; 23:k5p92vBsTYUxSFn2PdHdqvxxSHIhFlJtYHdS/XnQo?= =?us-ascii?Q?mkW+O/ukYao3ss1sEXkkKuIjKgGw2Sc8NmQQ9n0E3DOg592GYZ60F4VTicE1?= =?us-ascii?Q?vO99hR2xUtYcYVaBqo4x9SRrhpOKstCDlP2sPSLG2E06conecnqvKvSxKGLG?= =?us-ascii?Q?ey2iwGPEAQ3P4oiromZdlrtrDcotooklBn1uEbTm6IX6Bnhu80uftou3K3MZ?= =?us-ascii?Q?60EBJNx7vQGkjd2U78SdjbTzqWphN7VB4HVzadQlS9Tlx8moAd9qz228rIxA?= =?us-ascii?Q?Td2HkMWMk6LpxNTkonFlbeYKVtNf2F2nzqJyyR7/axOytMvZargbvLO5CAJh?= =?us-ascii?Q?5KBni7FCjwVUVcv4DEGv+Yf7fEqK6+cB5vhhuF/dgcPSZJYL3ZcGYaUASzpm?= =?us-ascii?Q?yq8KV4nKS9IDDD7IU42BHhoswa7gV16R1pcRPz/JYByZxIsBCsS+sVRech2I?= =?us-ascii?Q?MuEl80iHgvTidKa3vcBL9f05rRA3tqrUhUjylRkrdZM5kRW+GDo1GtcbPDY0?= =?us-ascii?Q?9FwJ28CFYWYHg/zzd0pM3REIUzbPmzn/g0vjtBGaeADTeAn3nrfg9DvxDgII?= =?us-ascii?Q?FsV6ZXOtb6tDtgqPcooOUf6pYV16CvfSNKX138RlKI7Vo7Cn5huBKNWHiyMw?= =?us-ascii?Q?cPoBVx3fwz/+13EB975c8ZFFBwNZ97YutvANDAqyQ9gjtYaJmcHyliCbVage?= =?us-ascii?Q?CspbglJZPx9W5UTzej/CafMSlHp4GcqjjrrMbVXzqRplw6t4cTr4Jz/OifoT?= =?us-ascii?Q?D3pS6yFjynmTggFBbGhPbdg8eA5FR8bmevRqkmhEatmi+n2rkB+ByVbmfuPz?= =?us-ascii?Q?z1ckJpSVuChBKXoYjQK1OD9mwGjySrmEbB9BpVAhYOzdqspj19bhp2jyBbO5?= =?us-ascii?Q?3UWFJJgB4q99fHippl/4+YdRBtJfDV2eAJPYe+6Y1vmKZMaj+aQO2yx+iynB?= =?us-ascii?Q?9l1gVMAp+h3VsOA5u6Az/JRuT8MnR3rgWN9N4EswNfrMAw43dA2Z5lQLVvmv?= =?us-ascii?Q?MBed2Bf7l5M5g7vUGZ2fuiHG9+Z7tTwgu38VHwFzoDjVhSd4EqqqLRsgKzyH?= =?us-ascii?Q?H2v/42Nh7VYsMz2PR1lSSewWjwJ21g64U3cO2agf3OaZit7XA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 6:6lVRICsOyxGG2eFojblR6FByitaivp4A4fv4JXO4LEFDBRd18Ga1tfLgO6oPMlwzYEu2bIU3HfZApZnqtGXzxCqcFdkOKBnn73P+Czq7Y37L/bGYHB1kPiP6D7vwDACO0P4CLlDvANu2WRKw+tCdToiKFptQ1RqYi15eDZlbdGkLs3qfScfqzeN4BikznSk0ehMyrOoN/DJqXf9ShEYxfB6znVZIcvli5K9pl0mA2JhE0XbSOXZhiTk8sa44Y3PS3ptvAFqWydpO3t77zh9TkyGoijh7aOM38ddvtVMfzMCGcY8GBOIYzgI3Cd6V6ibWRH2xNbY7AaSM6Q0zH3Pg8A==; 5:W1TCKpJsJfJJ417pJVPZy8Am/L666M6bgEN1yZyCtsAdkeURQhYS/V3/9TjT/UdtjMuxrZIBysT15fGttWSk4cw2EIesEyY5LWZIbHgxxaoSv9/fIfdG9HFPdSVcIHWjlaptEJQexZzXECy+tt6zQA==; 24:zhSaEKQfnzGuhaylKjOxoEIct8DhqJbugTG4TW+gs6VM84ECjMvAXLv+/SbXpbdtThq1i23YbL5iV8gEzm5hGR2DBA9jY0q1jpPuZr1Tfko=; 7:YaCZcPNEcqYmSRZFVhTToV3YYVREYrJt7CRIK8hcuBO9PKyKz8Xx4gYswAvxKLjvKD2s0CRXJ7ffqVfomtFn+pxEJ6zeD4sMn3LYvyos1dC8q0kTD0ucQHGd4SAdsIWMyvY0+ONQVMNsRBxWvKWS1mN1JRKjNGYzXw1vcgNka6oGRsVY9x2KbUcRNjU083Fz+Rqf2LgAyEsfOqimNkH0zklreYP/L60TB+JXKsjoZoXJGi02hza+w8LNXzqu//xr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0549; 20:AE7xGFYwwt5EFDyIfUlSim+FXjKfKBVx65zHgPoiFjMdc6hKayq9PFf6nyK7LKd42Y6PrJLyiqMtSSVkzjNTs6YsjxgqhtFmB4aE3aVkLqFvmD+mEbzauK3dLvDq2kQOl9xq4pEMxaRkC3F6OmDoH8IppuUl6+qt2/kMx2aWWeE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2016 05:15:28.1543 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB0549 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes an issue that a syscall (e.g. sendto syscall) cannot work correctly. Since the sendto syscall doesn't have msg_control buffer, the sock_tx_timestamp() in packet_snd() cannot work correctly because the socks.tsflags is set to 0. So, this patch sets the socks.tsflags to sk->sk_tsflags as default. Fixes: c14ac9451c34 ("sock: enable timestamping using control messages") Cc: Reported-by: Kazuya Mizuguchi Reported-by: Keita Kobayashi Signed-off-by: Yoshihiro Shimoda --- Changes from v1: - Set socks.tsflags to sk->sk_tsflags as default instead of a condition. - Fix other socks.tsflags values in the af_packet.c. - Revise the commit log. About v1 (as RFC): - http://thread.gmane.org/gmane.linux.kernel.renesas-soc/5646 net/packet/af_packet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9f0983f..50ea97e 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1927,7 +1927,7 @@ retry: goto out_unlock; } - sockc.tsflags = 0; + sockc.tsflags = sk->sk_tsflags; if (msg->msg_controllen) { err = sock_cmsg_send(sk, msg, &sockc); if (unlikely(err)) { @@ -2678,7 +2678,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); } - sockc.tsflags = 0; + sockc.tsflags = sk->sk_tsflags; if (msg->msg_controllen) { err = sock_cmsg_send(&po->sk, msg, &sockc); if (unlikely(err)) @@ -2881,7 +2881,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) if (unlikely(!(dev->flags & IFF_UP))) goto out_unlock; - sockc.tsflags = 0; + sockc.tsflags = sk->sk_tsflags; sockc.mark = sk->sk_mark; if (msg->msg_controllen) { err = sock_cmsg_send(sk, msg, &sockc);