Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8504692ybl; Thu, 16 Jan 2020 18:17:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyc70QMnf4TOotgoJjV/zCDriRP/8NrKSzPtJBthxRhCJPfyE05im8ziuqUN3pJHj8Dnwsc X-Received: by 2002:a9d:65da:: with SMTP id z26mr4506383oth.197.1579227450220; Thu, 16 Jan 2020 18:17:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579227450; cv=none; d=google.com; s=arc-20160816; b=AvMqPoSJNtUWKUN9F2xP2bnbeWWlbZ0RLG6OTcm2An/AfVnxURl9kLsMdmVcNHBPt5 Kbwf8lTV07ZMGrmdqEP5Bz+juWvxkvzlRFALxCwTOg3XnQVyH2yPBEKzoQHisnjDXCve 4g92lOUlhF1zYsZNGqz/wkwuW54OfPLZqFUjKbnDGhBnZHnnzrrtyCJOe//arqHTR/7P rKcsyj/HK3ozWjOSOaaDbKwu6EXKhOpoE0XMbnr8M7kh/30k7FGjYtgHsSMhC/NzssX4 Hswznkhk+8y5XOXWi2T75PLsJjZlcyVfUHBuGIxjTNnG2K0ckMrPgIkcpd05bRg/2z+z P6Kg== 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=4EMe6PQg/gyqzXX7wymdrCSevsByfJSH9JZJdHVOn54=; b=PfWk7PxLO/Es+16pjRS7dALfHYF5hzINQiB6hVN6oM6JG19fVmHyeaxT+8eSB2Ic6s hmCG0dyzx/Lju9OG/+djrxgBxe4jbQhGu9fHhBfrRSHjQkN0NmtOpeUQO2PqngAPfzFB 9Rg7wK0xt2jXl6/5IspPKBPqK/Dv5ToHWsS+1G0DJyGMUclEWMmbWBr9WF8UZwfhXZuQ 6uqulPzJjwf5wSDR0Y9BuG4bLb+r3IHrNhBMUSNevb/nadHdwVlbH6XW7l2MW96j0ohx 8N5Olip2fW/L6TCh5Ow/mBGg61ADwZw2ia9Pu+aJQWuE14O8vONvt2zjrel+7h275rNh gsVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E6I7baYO; 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 g10si14442882otn.12.2020.01.16.18.17.18; Thu, 16 Jan 2020 18:17:30 -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=E6I7baYO; 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 S2387547AbgAPXYX (ORCPT + 99 others); Thu, 16 Jan 2020 18:24:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:53288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733295AbgAPXYU (ORCPT ); Thu, 16 Jan 2020 18:24:20 -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 4D5DD2075B; Thu, 16 Jan 2020 23:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217059; bh=+WiKHkloAlLpAzCZp4UZ8FL8lS55nC7i7zkYhXgF1Do=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E6I7baYOxq1ZZQRzf/HSvm14CcSLuVGAmF+0vzQLjqT8+SeW63bq9K1VXmxcK6Im9 eo8intES3qn8IW26piXa0AJQpmLS+93KQjFrndATsBLDUPBnnE8d0pGNMOPCKZuyq+ GCAzH/yvRyljJhcxQoJmSXRTaldmYvqU6Vs06/9g= 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 5.4 131/203] compat_ioctl: handle SIOCOUTQNSD Date: Fri, 17 Jan 2020 00:17:28 +0100 Message-Id: <20200116231756.593290101@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@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 @@ -3532,6 +3532,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); }