Message ID | 20191009191044.308087-35-arnd@arndb.de |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1171694ill; Wed, 9 Oct 2019 12:12:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUynVaGsT16z1bThh9u8eg95sKF2mlAcGhZdyztE4yAMQpmvzHd82e3EVDMeJCwflhYlAp X-Received: by 2002:a17:906:4e92:: with SMTP id v18mr4281254eju.242.1570648332526; Wed, 09 Oct 2019 12:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570648332; cv=none; d=google.com; s=arc-20160816; b=QrwBLYuEm40SeqGVfXijxByDHS9SZj//+/UaAUVz6QzTypo5JSHANixb4s+5aCaupI FavrsX31Q7A+AzlYiwFrfoNIrtpvSiaG1gpSXmwXdRD+NHD0X0o7fnhuWA9uW4VgUXaq /dLCbGpwPeRc0gXQbu8TBIUaYTU/UdD9gqjrrkjL38NYscKwVry1xa7xT9oHzmDtRy2l d+C1NdfCSEt4cQe3fgwJP3VLad5EcgLb+iUXa1Vs39Ul+Pc8Bzxk3O1aO4aJLM90f+R9 8G/GGqyS9AyhFExJ3a3XA5DSajnLf7R8/jX1UOKI4ESx71uBXKRylQdDYH20qknamj7c Ig+w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=d+tRMb8OUyKpWtjZ8a2cJziTxAog7pgM955aYDCRuI0=; b=LfzYeRYGEC6Ta3b8jT6fd7uagCzQfMSzIVFDA97aF5Yn3+Wy86rwZFDKkiy1PBgmip 9VpNIhY4yhbSLXU3tsQ82nhfHeFtLsnI0G1QjTFnA+Y5LEQcErM0yAtU84Rq4W3KWrul eRIa6NgN3UmuCxGmPwtPptQV2awreJu9C5oQH0/BJbwCvuPI2I9KO5jJsGyVwz6Ml+ol HBeayYe3tMVH9GJiVgyQHJPRTnYHSobGTuj4flCn6oS+iyzsO5C3aV23b390qq4HsIH/ TDh2q3JSr1p7iWcuVfXfmqCm0OgLPrgzPuGSQex1F6+mmafUDQlaoVt/dzHzBga1F0Hl uwEQ== ARC-Authentication-Results: i=1; mx.google.com; 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: <linux-kernel-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1si1796997ejb.44.2019.10.09.12.12.12; Wed, 09 Oct 2019 12:12:12 -0700 (PDT) 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; 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 S1732113AbfJITLf (ORCPT <rfc822;lee.jones@linaro.org> + 26 others); Wed, 9 Oct 2019 15:11:35 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:56199 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731824AbfJITL1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 9 Oct 2019 15:11:27 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N8oOk-1i3afR3chC-015pLd; Wed, 09 Oct 2019 21:11:20 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-kernel@vger.kernel.org, y2038@lists.linaro.org, linux-fsdevel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Eric Dumazet <edumazet@google.com>, netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net> Subject: [PATCH v6 34/43] compat_ioctl: handle SIOCOUTQNSD Date: Wed, 9 Oct 2019 21:10:35 +0200 Message-Id: <20191009191044.308087-35-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191009190853.245077-1-arnd@arndb.de> References: <20191009190853.245077-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:uemQDqA8yQ6MG7MO2w2hB7mLVVCYHFMtePKjKuwvfP+fKw479wi +3XH2jpG2j8lBDQxUHlpmJugPSEVHS4OBNcQQA0NBvEAx6hzxafXBAI2rIJOiSHd0Arteyp h8w7y6xun7yngr4VavE/jm0+bod5rapG7AgX0+V0MVAbkqWohYWJZroUHvaveum+3A13lwE P3MRbIbyNK22sOumQLM8Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:jCWR5TpYalo=:JEiqSw2ynBAY/yIo966rNk okajkQuPa+YtaOW3JvOQHr+J6t8i2U/E4DRyD7qU9Ft7WHk+5KHDWKi9OdMFrr5DNtmbNju8D 6H0QHl4hlMfud+pWBSsw9QVG5J5Ri4meSjWM3ZwSZpsgXizmK6bS7m+FTQxmPWgLml8oyxO3N 9V+iyQjFE7BvalkRhehCpZqW3nNDJ/0I0/K1KDXVTCRi5AGqLCbDV0p15Vre6MgNgkIVEE1EH p5cpk/NEyWW7OdKW2VrazYGL8xfVB7cy7zTrvynJQGjUIUOMNnJP1BNg/+OZccrThMqnA8uCV sdGpN2tJxi39qlX+cqcgRqtkzTXxRrEaGAaL19qWhfnLJRUovmlrtiNyEHdMisOtodXqIcBcT xQpN1lTgYPOGorSDbBasrYiwhCEmiLOhxMEXiRzerRza0j+43fYSp86LEtJXdFI50q51Gz7km iCe+h8m8pMU+xDFOm24REu5YOnyVUeqUZluBytLM6HZCeoop0nMMMz9BlDAJEc4wh+fD1ostO nGlel+ejpQxWbR1V69v8cZIPTG4LVMtI3iERXe9SDeVyyL6YJyAtDCfKJYrslnC5lfqq2eEwL 7ADmRETHmHk3FEubMm/ESuUxcC7H7vRpxbTRD74H4fQufRgTlmagVPaqZ/u4SfbE6XJY91cw1 O5jVvINrL+juEKnOMyYYQOgI1tiDx273l5T+B5gVZX5jPMjUpChv+6KqqnnSxmHdedN7nT2K5 HbfNwN6FIlcvrqnbAw2gYkDwTwSmzsDiUlvrrlvynVt4uy7E9/czPv8DIL76UJQgQYuB4S33J 9KvWA4DH/RO8FAbFVMoqgC8sNNmMyqOeIJ9FW0v17DZoX5xEU7WbvVbexDdpLX/cp6tvl+N3s 3Y7W252bI8BKRpjTbgXQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org |
Series |
[v6,01/43] fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
|
expand
|
diff --git a/net/socket.c b/net/socket.c index 6a9ab7a8b1d2..a60f48ab2130 100644 --- a/net/socket.c +++ b/net/socket.c @@ -3452,6 +3452,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, case SIOCSARP: case SIOCGARP: case SIOCDARP: + case SIOCOUTQNSD: case SIOCATMARK: return sock_do_ioctl(net, sock, cmd, arg); }
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 <edumazet@google.com> Cc: netdev@vger.kernel.org Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- net/socket.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.0