Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4628772ybl; Wed, 22 Jan 2020 01:34:53 -0800 (PST) X-Google-Smtp-Source: APXvYqw487GyqPGWSq/vuBM/rcoEzu9wPdWkmqBy6Sv9FBvh6WbUfHPEK3G9zzD7CzYsKbKj6A15 X-Received: by 2002:aca:c692:: with SMTP id w140mr6356603oif.139.1579685693257; Wed, 22 Jan 2020 01:34:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579685693; cv=none; d=google.com; s=arc-20160816; b=bFWu/tb7rpZ+gbzcVwFQslw64RZrMNxKTMKv9PyT2S690dv7L30UcN0+aeGjtRrbOe tfmlSw/hAIuOCX6ARnXQ44SqBrOSHbhm3aEqb07/q9EY0s85yienffqNVU6OET1IPofJ 9r6tVx5WHO5GA0BDBK3cAn+w8F2HNcDB5o0zq5GU4/nNymuc6/2eJaqZO3L9oRZ95wFP ace/1Efq7ry5FLUbxNq6KAVpIAwvdSTSY6Eq7dCmsszIoqbQUjD15ne6pyrRvMNLpEVu aWTHZiQAmJVOhChNDZWsjXiAWY96CK3pPzTwIrxDZJ2C++D9WcENoN15hjc6KfOhXNKn jtkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DiH83qkiyZaoZP99md/qYSZSucTAn3q9k42Yg222vUY=; b=lFTkMqX4kQYLdbTOxN975bxxE5Fo44mVvzsNGadxETMTqX1V3NuoPRDkKZbFGE/DUV p7NNdXGBSBW5RTKuU8Xdijx3MUo4vMxeCEQCcjK+pTYq3xHy2Cq+vGkjcrGp2tNe8Oms utR/PyfJG6aCFgJYxM0W35R91RndWkIrlb4lmA6xK2Uv42ac+WA+BGjrBMXUHPPYWyev yDb8nUNOEeGr1gvdUkKhhG6otFz8qBQ2n7pTNXWYJhDuPM9Ejpab/YTlJTG6kmP7c3jZ GkvWRt09l3oLy45YkiOTV/Sgk1/pDEAvz5OCLfIVpUp4emRAEp2ED6OiE+dqZlpKsxaX y07A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bi1U8rI7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d14si13701740otp.151.2020.01.22.01.34.41; Wed, 22 Jan 2020 01:34:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bi1U8rI7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730468AbgAVJdR (ORCPT + 99 others); Wed, 22 Jan 2020 04:33:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:46844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730410AbgAVJdO (ORCPT ); Wed, 22 Jan 2020 04:33:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9E0272467A; Wed, 22 Jan 2020 09:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685594; bh=TDgMXZlJS+WrS/uN1NtUtQX7qncL4h0PuZMIy7Bx+V8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bi1U8rI7+iIAxblAv/gu9OzPlQxe+JKaSgZ2fODKNajfT0p6+d1UvqQs51E2xlK7j 2LRV+E4MUk3ZF2I36ezMXEuHrh3wFt5qX950ZOntozK2arpiCR49JazHJtR/ie2ujO BC8s8GHPYf9ZfjopIL6HwDYABwxBW8jizzvaIt00= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , netdev@vger.kernel.org, "David S. Miller" , Arnd Bergmann Subject: [PATCH 4.4 30/76] compat_ioctl: handle SIOCOUTQNSD Date: Wed, 22 Jan 2020 10:28:46 +0100 Message-Id: <20200122092754.893872456@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit 9d7bf41fafa5b5ddd4c13eb39446b0045f0a8167 upstream. Unlike the normal SIOCOUTQ, SIOCOUTQNSD was never handled in compat mode. Add it to the common socket compat handler along with similar ones. Fixes: 2f4e1b397097 ("tcp: ioctl type SIOCOUTQNSD returns amount of data not sent") Cc: Eric Dumazet Cc: netdev@vger.kernel.org Cc: "David S. Miller" Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- net/socket.c | 1 + 1 file changed, 1 insertion(+) --- a/net/socket.c +++ b/net/socket.c @@ -3143,6 +3143,7 @@ static int compat_sock_ioctl_trans(struc case SIOCSARP: case SIOCGARP: case SIOCDARP: + case SIOCOUTQNSD: case SIOCATMARK: return sock_do_ioctl(net, sock, cmd, arg); }