Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8553232ybl; Thu, 16 Jan 2020 19:26:18 -0800 (PST) X-Google-Smtp-Source: APXvYqw5lwE9zqTntAEanZefGIqI151yAeYgmIgPDOCNpBaVteUfIRaTICikGRLFS44XXqT1SAuN X-Received: by 2002:a05:6808:24e:: with SMTP id m14mr1982435oie.168.1579231578749; Thu, 16 Jan 2020 19:26:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579231578; cv=none; d=google.com; s=arc-20160816; b=sQcxZ/vGDWQWXuut2BWWp9dGtOWdtXkApiPO1nTa/UT7DAREtlH1kGV4zJQp8S30CD 6U0mNHMTJYkcL1O83T7VB1eTY4wQF21GNtHIrwwp/ryLwRiODewbWGbdtfAzdGBn5mdk 4hgGItDi5leeSNyioCczGcy40rXnAMlFdEsAa7YxNB+mwuooyk/o8GOyMDKM7gZhNOjH glztQAaIXsCD6tlEPmStAxw5ZuDpBKstDTybaPfe/JiimDRAXOyyOVfJtN775HKY3Vbn iHBOq86EnzROqZLEUjzW5HdW4ujJE2IEAZ9wMhp8LFdROUpqe6IfHEDv/x21lEzR1JEo gzWA== 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=Ah5z52OoKw1+95s42IjPlZSQTBtBovFitps9qrulEgk=; b=0wvo0mV3zAMac1HWRcvQFcvJrw4QSTQbDNJ6jGENmjcLN1Ar5k2wxXd+aU2PmKeOwa 8azHue2jPQYBSPx94aRnkbb0KFjXjnGNGfcR8+K2Y4ZUlLBX3OwpOvF99KESlbI0IudZ kTY2Abm5uKDx7wjGe0fl37pXfEfW0XxYZw9LF2/8hwEG/qWD/tmjfbQV+C052xJUszYo 7jZXibdR4kmaR4s/iFhBagGaX7Nag0M3EyDt6ztjZHArE3M5g0k71iDMBcPOGNS4eAu3 06l9plm/s8dnYGs4MLlgsFAv9TA2VgPLRNVTHue0AmZkqyDcHb8E65xXPnHipM4xb+3x lUnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aoNIjrWa; 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 q9si12443370oij.125.2020.01.16.19.26.06; Thu, 16 Jan 2020 19:26:18 -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=aoNIjrWa; 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 S2403813AbgAPXfJ (ORCPT + 99 others); Thu, 16 Jan 2020 18:35:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:42220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404089AbgAPXci (ORCPT ); Thu, 16 Jan 2020 18:32:38 -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 CCA5F206D9; Thu, 16 Jan 2020 23:32:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217558; bh=+Bey1xABKC1HL/CAqE3249BlH7P2i2zLFnUs7uty0ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aoNIjrWaor9TuHMgxnH7/BUMEiuFLcWMQ0NmPcnVGmJHq0tS65a/yuuoZolKBfOfQ r+HWgXOruzDR4Xn9d8n+tIGT8uPr1POpolwefSpiN6OGxU2aZD0wwfn7Bs8PJ6TVp1 SLqyS5gU7nv1vUPSr0b1ulI0/gWDgpYWAb1hrIgo= 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.14 47/71] compat_ioctl: handle SIOCOUTQNSD Date: Fri, 17 Jan 2020 00:18:45 +0100 Message-Id: <20200116231716.236179399@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231709.377772748@linuxfoundation.org> References: <20200116231709.377772748@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 @@ -3267,6 +3267,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); }