From patchwork Wed Jul 20 22:01:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soheil Hassas Yeganeh X-Patchwork-Id: 650915 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 3rvrTk33rbz9tpT for ; Thu, 21 Jul 2016 08:01:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gmH6TYRA; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755187AbcGTWB1 (ORCPT ); Wed, 20 Jul 2016 18:01:27 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:36050 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754033AbcGTWBZ (ORCPT ); Wed, 20 Jul 2016 18:01:25 -0400 Received: by mail-qk0-f194.google.com with SMTP id q8so5009740qke.3 for ; Wed, 20 Jul 2016 15:01:25 -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=apLKG9N9xX0uVSNvkbepwPgZAz3VUTPnmB0Oo0ji3DU=; b=gmH6TYRACFbXP+yV1o7RhfPgqz9rZFc8lQN+My7FfVGbepJDxXfL7vnEly59p8s20k IQrnB+hu6QDW5UyOJP4EQGywjUtDFNW3je9bW5my2n8ceByH1K1RL44silAEm3KUPxUd eIHWauSRwKGXQv9XHNdFoInsIe5kK0+9ySRJHHl0kTYS+DdvQ+JUyVTMKpUcC7a3Fju6 3t6EnpmFffp0yFFWzWYlQ1vx8Ddr8WsUdYY4teP2LQFbmepGWBOZ7shyZhNexWO+nX2c 0CDt4/Mlk6WS430Ycwm8QQtCQnMsykCjUFUhTP0jWjLTlHjF94aU+9W6Rxo5SPMjJsvx e+9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=apLKG9N9xX0uVSNvkbepwPgZAz3VUTPnmB0Oo0ji3DU=; b=ZyP9NV8+MU1ZE2j9UUiAF03gNThCf0fGT4rzE/rkTw4Wjck9qlEz8pRgTBXBc19RTd AhBRjhDs697uynSdCm0/y1BU9s8Xddh3AiIrDQV8kiYFs3TInqlyOAjFwwSFOgmSd/O6 V8nHLun+ulUOPT2PsCWpW3yZTvITlGqXfuwtfX6Htgg1zt1yxSE4ogxnfpsVMCPCUss5 8tul8esSwgd4izwv/Fp8LJWp/C4hdQ6VEk4jnnKzhnHo/oxT6KigtxPoOp9zMK9Chv51 enrDJruYJFn8HjwnnffOSPDgN3DnY7U1Sk6f3Rpc0goJPfncszWQ1L0qcFnVDtVnDcnV WJhQ== X-Gm-Message-State: ALyK8tLlVfJhYZe20ZIWg3l3n9ER123t0w+TrhM+GV9KT/hLUaGJp+BWAS3kuy2U8srX/Q== X-Received: by 10.55.20.29 with SMTP id e29mr61487001qkh.30.1469052084825; Wed, 20 Jul 2016 15:01:24 -0700 (PDT) Received: from soheil.nyc.corp.google.com ([100.101.230.57]) by smtp.gmail.com with ESMTPSA id r10sm2587910qtc.5.2016.07.20.15.01.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jul 2016 15:01:24 -0700 (PDT) From: Soheil Hassas Yeganeh To: davem@davemloft.net, netdev@vger.kernel.org Cc: willemb@google.com, Soheil Hassas Yeganeh Subject: [PATCH net] packet: propagate sock_cmsg_send() error Date: Wed, 20 Jul 2016 18:01:18 -0400 Message-Id: <1469052078-31269-1-git-send-email-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh sock_cmsg_send() can return different error codes and not only -EINVAL, and we should properly propagate them. Fixes: c14ac9451c34 ("sock: enable timestamping using control messages") Signed-off-by: Soheil Hassas Yeganeh Cc: Willem de Bruijn --- net/packet/af_packet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 53e87ce..b43c401 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1930,10 +1930,8 @@ retry: sockc.tsflags = sk->sk_tsflags; if (msg->msg_controllen) { err = sock_cmsg_send(sk, msg, &sockc); - if (unlikely(err)) { - err = -EINVAL; + if (unlikely(err)) goto out_unlock; - } } skb->protocol = proto;