Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1053646pxb; Wed, 1 Sep 2021 16:22:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+q7nu6USsOrppYB6skGetY1YYZUNLUPRaRCVNIP4013auCGhY0FzA0f/ldCOJlCTz+g6K X-Received: by 2002:a17:906:6bc5:: with SMTP id t5mr374050ejs.340.1630538551396; Wed, 01 Sep 2021 16:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630538551; cv=none; d=google.com; s=arc-20160816; b=VBDVq0jzEFwFT8VAzzTYNqZqwYB82sEhKSJUy22GqdGg7F0BUjmpOBoqk4Vd2F8YEO jEmTEpPC/wadk5ziiZHzwFbyyEzjSnXsi93bxLyd485eUII80ZrD0KV+bONn4DuaYsd3 rgMCZlHmKigYXP3dAl4Fl8tW9hGiUS8PeGoCkHZco0iJ8QABp8cFchvpZFrc9ZtDpVFN YwWH9ngIopYelDuLttDfzD3DTlKnGtYe3SpYuOZUrnAy7aa5yZ752nb5NpV3fq2k5RV/ e0MxJAbBbPyIJRe0NJ1QZSIozmrYrWmlF/bKJ+IunxPcryt4KuU4w6bGCweG19pusius h9PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=rnHx1f5aM1mujLwY1JD4LVesoKkdAWNV9/C7WaKRQmw=; b=tpLpeXpbCyv4exG/yNa/eamvRhzhb7nW6KfUO6L92xqRkDPRi25vTfPOc4v1sYHyTy dPTB+blZq+OUn8WeOM22WbucKj//RADidABUq1X10e1Q/r1ec0vIK4p3no6stxGT/ntV Li3FuF7c+UGeLaVZbIkcZOg6JaptDY7TBpdsE+D0eP2Ew7EBIgAdsPXaapHSmPrdaRgX +2/o/zgybG5j204K3pRbXCidtskDZEAqVucRMj8nd/WatrnGBZ1Nje00BcsQJUJp4qQH 4CS2M7Z9tC0+7u/p4gqfFxtH03ZUPTrH2IlFke6H+dGtP/1O/wR386of1RPtaCFrNL2o 8NAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NxvRQDGc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i10si1362552ejd.99.2021.09.01.16.22.03; Wed, 01 Sep 2021 16:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NxvRQDGc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344922AbhIAXVK (ORCPT + 99 others); Wed, 1 Sep 2021 19:21:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:38630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbhIAXVK (ORCPT ); Wed, 1 Sep 2021 19:21:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 46E6B60F4B; Wed, 1 Sep 2021 23:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630538412; bh=jRDi0tXYcFMrWm0Yh9b1bdEmEczF5T2ak4Op6iKq0ao=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NxvRQDGcBoFWPfpKZbJO6U1ejv3xRHNzmu5RnOJMjMI+RY/i4ERucpAHr2NDMsoSs U4Nq1t6w0D30e+9gQWxf0Jh5vRvwb2uGkw9jzYGXXcMKxbmUWAAiC2HiW4jKug/bC/ hF0i7UNL9NLkknlPXnLY+bEhcCGpFiuAZgOSseAuqMZEXltqh3HppTjDDJZw4ySTxJ W7cedSq+MzWcNcfutQQoNrYsVWEWxhl9hxZTuPEi0JtwaPDhazHh3M+gj4EZGgN1hE Meh6s4fkcOpZjzrSplkRerQhuPjFdQJxf001ikiUIkdTswfvN5qXpGreGt3XPYSz2u mjWudzNK+JWMA== Date: Wed, 1 Sep 2021 16:20:11 -0700 From: Jakub Kicinski To: Peter Collingbourne Cc: David Laight , "David S. Miller" , Colin Ian King , Cong Wang , Al Viro , Greg KH , Arnd Bergmann , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [PATCH v2] net: don't unconditionally copy_from_user a struct ifreq for socket ioctls Message-ID: <20210901162011.3ce5f012@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: References: <20210826194601.3509717-1-pcc@google.com> <20210831093006.6db30672@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> <20210901070356.750ea996@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 1 Sep 2021 11:01:32 -0700 Peter Collingbourne wrote: > > > To stop the copy_from_user() faulting when the user buffer > > > isn't long enough. > > > In particular for iasatty() on arm with tagged pointers. > > > > Let me rephrase. is_socket_ioctl_cmd() is always true here. There were > > only two callers, both check cmd is of specific, "sockety" type. > > I see, it looks like we don't need the check on the compat path then. > > I can send a followup to clean this up but given that I got a comment > from another reviewer saying that we should try to make the native and > compat paths as similar as possible, maybe it isn't too bad to leave > things as is? I have a weak preference to get rid of it, the code is a little complex and extra dead code makes it harder to follow, but up to you. IMO the "right place" for the check is: static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) [...] default: /* --> here <-- */ err = sock_do_ioctl(net, sock, cmd, arg); break; Since that's the point where we take all the remaining cmd values and call a function which assumes struct ifreq. Compat code does not have a default statement. But as I said no big deal, feel free to ignore.