Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8370977ybl; Thu, 16 Jan 2020 15:32:04 -0800 (PST) X-Google-Smtp-Source: APXvYqxwfCy3fxMUEwVZbGJsAV4yvwrjBADMt25tMyq/Mq581SuGNNPXYH9gVKfhMrFCHxd8Fzqe X-Received: by 2002:a05:6830:139a:: with SMTP id d26mr4192050otq.75.1579217523952; Thu, 16 Jan 2020 15:32:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579217523; cv=none; d=google.com; s=arc-20160816; b=eR3LmFfl3LklF8akwNoi94YgWniRHWRVPVoM4WxUhYiaSMRXoqgf30ohBWO6/Znbnd GsBfMYXc7u0x9MpvTgYhYm0T9nUPD7th50g3ywF1vB96zEKqRZRlv/9it73Zz02t5neN bl70lRgYWLAwZWwXr5U8emeM7pXTFKpZMbE3ry6VewiCERoRicPA7H9kOPOsqxprLZ+B GNO+4J6L6PfYzny7dlCYNR9HbS2/2/9+SpjCBf3WRw9/4v4S+efTf2sQwijkLzcBNRcf wJ8rzTbrWDyouwIbXZr9iT0UR8LIvRfK2wRIjku348DzneHmGtCmZRJ6vkNXcbSSPr4e 2ZMQ== 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=KEyGFlbc+UmSRA1ETj9+LucWPVKEqvBgtlxvB2+6wwA=; b=Ll804sRc1jkVvCfi38Ja+g/OXm6SOKY2u65Ghmb/G2cuAh9MEwdZicH9r8fdU9aTNF WZ3tLRr/OAo2n3vN8Rn34S7F6VDrYB9/AE+tYL23MG4T3y9KgBoLLYFY077VcK06tQRY dT5GAbVXVHb/+Sk38eMVqMlsD/oG0jNab753fA2yS5J0MNjYCmjxgRDI6Gib3KbNC4/3 lufhcTjp2tjeSlWhtA+2BCwrliFWUPpru3QuBhiOzTng8GoF6xq/3fwbf1mVMhIG6yRP Hnn09MCAlNVIMqz6Orx3p2aKlpUTYyISItQWToE8kR9WWfNJG3/5gon7dVIY4Bv4LSyS u38w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Qd1MX5PW; 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 j3si14057997otn.154.2020.01.16.15.31.47; Thu, 16 Jan 2020 15:32:03 -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=Qd1MX5PW; 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 S2391291AbgAPX3b (ORCPT + 99 others); Thu, 16 Jan 2020 18:29:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:35106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391266AbgAPX31 (ORCPT ); Thu, 16 Jan 2020 18:29:27 -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 295EB2073A; Thu, 16 Jan 2020 23:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217366; bh=Tv5X94cUn6Cb0NxK31Lnn8p5Qz5H+ux/LUAcJ4MC3k4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qd1MX5PWQY9GEi++gSGQLVIvGNFHtZ2JpR220nzjN5aInpW/sF7yTQatH6ip8JN7d xABkIqqbZa+yCnU6+3WSaeuukjDcQZgnFRrdiZvk6lDb7oPobjZkyCynfLUs2UVRdg ZXym3ZtT72/JGWSnKGkbsqByqAIER82+CULM+IRg= 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.19 53/84] compat_ioctl: handle SIOCOUTQNSD Date: Fri, 17 Jan 2020 00:18:27 +0100 Message-Id: <20200116231720.052194053@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@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 @@ -3240,6 +3240,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); }