From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CB34C2D0DB for ; Wed, 22 Jan 2020 09:34:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E4CD24673 for ; Wed, 22 Jan 2020 09:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685674; bh=QShch5yP5fgS7GnlmpBmfX8k+hfvh+epfN/4DjWZQQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vEPitGx26Z2y8BRvKM4R8iraOY0vNyFeQ410ZUqQrtIaBuTWdu1eS8RUcDRkK3OHm kuqS6yZ+HvrygNwzKbecOP3f9E6BIs83I8gxdXEACa7i0l17pOM8S2/jWI+zT7dMJQ CCMlA49eSs0WoKK9E26o7DwjKlkMe6HMaPY00tu8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730217AbgAVJed (ORCPT ); Wed, 22 Jan 2020 04:34:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:49014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729970AbgAVJeb (ORCPT ); Wed, 22 Jan 2020 04:34:31 -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 E66B824673; Wed, 22 Jan 2020 09:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685670; bh=QShch5yP5fgS7GnlmpBmfX8k+hfvh+epfN/4DjWZQQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MgUd55xZE2PduXiqHEp4A3YBobTrW/SRVZ9dK1vCIhuUNFND/8p5Oh+B33UNY3EgC oWZhGf+W3ntxAq5cMEOTCrWb6WShmbUUSiPEW7fvHf0jScOAaFErLdilivu7ckgqub yToLeD3PU98OJHaOtFBEmTFgx2eQYF6QS5fxbGtc= 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.9 32/97] compat_ioctl: handle SIOCOUTQNSD Date: Wed, 22 Jan 2020 10:28:36 +0100 Message-Id: <20200122092801.626804167@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 @@ -3160,6 +3160,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); }