Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4630415ybl; Wed, 22 Jan 2020 01:36:58 -0800 (PST) X-Google-Smtp-Source: APXvYqxUwbnpXsLNllJ3BTi9tVAvmpC7H0IantvalaDR6VVmKkju/0TOidYk75rT54+j9eoaOUCT X-Received: by 2002:a9d:68d1:: with SMTP id i17mr6576390oto.367.1579685818100; Wed, 22 Jan 2020 01:36:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579685818; cv=none; d=google.com; s=arc-20160816; b=QEXbmpRTqMlj8O68No1Je8IbnrlbSkW3asG5C2eY4AID9oBqEQ5EPU9neW3ZPEwee8 3paggFRin55vyYYF35bivKl6p4UPrhQ69dGlHkZ+9NOolUdpkm6MqB7Gk04B5+AxSmWZ rmgSw7yUE1fFp24KBTPmKnuPB7xJxRpaSTQ38j+8g5wc4oa5ckRA9b48pHVw+hqKN0O9 /A/P4r65+3nTYrZLHCWWHRhKHyl0x+TtKLqqYG+2ROWlx1imosYgY8/LYZfwHRpnBhNi LNfijfsoHA3ImB5vAGiVAmC/0L9NPVtTT8KU/T7b1kSab6m2rx879VYeXbZWV82qJIAN Vu5w== 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=g1rCrRWbo6MNBhNQbhVasu2Nos5bhKt+SuFnJoPIqm8=; b=S9QQTz9B8mY1Kf+cu7p/fflUIoh2wWtNO6oqytdzHEHCFtsL9h51R3Yn2mQC3eWj8F vbiZs155uIpehw4WW2taFdu+ancWxJ9c4uR8wyVdAhMHXO4pyH8P9/KiEsYb2nlTG0TM MZp1534zpNmwgSOy6lVG3Rh6UYU+PYOYVw3WubWlbqisXtXhCgRZdkcQHS18ITRpA3Gv AOl6Cg9+xYuI4N/RK6SqCA7vqFacjqaIthf1Jv25Nq9aKc5kfCKSUS4vfZHwOXN1yBkR 8+/1+sjpJUfoM0GgVwSK3ylWLEZRXX7Q9fjVkmo2dkYN4UxNuLsCE1Jk3tb2xcmt/SRe 9aOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MgUd55xZ; 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 x23si1324142otq.41.2020.01.22.01.36.46; Wed, 22 Jan 2020 01:36:58 -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=MgUd55xZ; 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 S1730921AbgAVJed (ORCPT + 99 others); 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: 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 @@ -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); }