From patchwork Tue Jul 30 20:01:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170105 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp3046714ile; Tue, 30 Jul 2019 13:03:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqwlyJLPfkgxVtyC2nHU7g4UMkXuobDPYfDzzF9sSe3ZkTp/dk+XmhAciwfzMk/lNLwd/tMR X-Received: by 2002:a17:902:a413:: with SMTP id p19mr117680807plq.134.1564516999875; Tue, 30 Jul 2019 13:03:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564516999; cv=none; d=google.com; s=arc-20160816; b=LAPuZNIKI9na/QzESysKGaEmONmGb2dKYCVgAKS7QzalnsxYl5w1Zg9fzphsKfcjh9 zva6VAvp5tXBv3/rGZCPR+XPfmXE8/oXKKSm02txP9BxZR7gJ655thiEVNxYBOerJqrL 2zwQtQ59VesyfIG7IjbwcsvD77UyLHL7XgWXk3hp4vIjJQUoV1CPwzBRJ8PiwKTIki/h /TK8nEsIyK2oVAdTLAkltQ59ny8cTChwAZzkDf1NjHKK/o49PPzzMD0Wgze54/D+tMTl S50K2ZJxON/IWlXrh3Y/y9DFimsu/MdgG3C6QcofUSxsQ0t3VQMKBhkNkITTd0cJmS0X gB8A== 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=Kj6gXlLpjAdVhpY/4tyqlBzru5zybUgik3+3YxJedgQ=; b=R7FOJICfZCrDnsA/CwObG3Sk3vNqHlczlClQcK4yqHREeKoyG3JeYUFiiGzw0f451U s+B6OqyJUn9quzo//jv41GS48e61me6SMi6ArJLR1L6JyhYiNjcCuuFQngrRumCzyOMF ydWK3SrEzuvGJvXJztqgcv0b5rau3mP4RE+DyOnlg29SM8MqOfWxElWgPqEyJ0VXLqSJ w2mKXMVGuYNSmKuWdDdArLgTbzGky249C0y/CkPlG9nYYvDQhCtNiTpB7T1l3+4Hg/dc 6r1qleJt1OyDX/DzynymRm5qc/UIoEiLxz5fr8OHLiKOA9stGtCABUFGFhYzv+incgg5 QoGQ== 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: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l6si5955819pgp.391.2019.07.30.13.03.19; Tue, 30 Jul 2019 13:03:19 -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 S1727580AbfG3UDS (ORCPT + 29 others); Tue, 30 Jul 2019 16:03:18 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:55395 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726174AbfG3UDR (ORCPT ); Tue, 30 Jul 2019 16:03:17 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1N3Kc8-1iJOc03PN4-010Ipo; Tue, 30 Jul 2019 22:03:10 +0200 From: Arnd Bergmann To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , "Theodore Ts'o" Subject: [PATCH v5 24/29] compat_ioctl: remove /dev/random commands Date: Tue, 30 Jul 2019 22:01:29 +0200 Message-Id: <20190730200145.1081541-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190730200145.1081541-1-arnd@arndb.de> References: <20190730192552.4014288-1-arnd@arndb.de> <20190730200145.1081541-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:ixl6q7ELY2CPbzKLyp5yiEj9Xp94vS2g2+D9pmZiqmQGtHrHVuh aP6VLFt1s3Angfhw3puQSSyPIQoMFC8JaAaLkWZaC0dvRz7VXG9RWpet+Nb76KQIPpekFKA Nd1b1kdnf+YNa3DAaG/jC8KTP1EdrF4cdI0wOPTlmx9eag5FHB2S6nJ0/Zmfkmri53ukm18 DiLPEdVaRaX0snXTmEcVA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Xy4izpXa1kI=:sVc73Mvr8CzeTr6AVkie+W Ki5UhfHTqiaYmzPJC1WgRAU3/qCbvvatP5Rs7Ptqozk94PUzdruutiYIu8Yi9TmHALz2GYGkM tWCINWkn8QZmmmY1adp3OP3ziuHeI6Y7j1IY5CT8OBjwJ65F31EsPmcDwlIvb12THeTsdBqdg +sR3BHARGMJmN+Pk2yX8sCHbu62H99NSWXNFWrdBywrciWeAskzBbkvkNhhqbOTysWybV2rvb Jg5icpjkAyglp/JalFGj6qKj3ikZTbpPklBn3O2jXQ4KhwqyO8z/3GPybItzr6wFuyErBcFGm R3vUXD7bvcgdguDkbTyCC64OufFxFDtbCXYXv+LYXsTmExt0mPMEoBNK5tHGpfF/dfFAGWNux 4Qbq3ohc8XRr1M1xAEzmKMPnOH/kLWJBTZu5yorCcBIKgUKE6jFPbiHqKvZzFL8oL7VFi97yI R1FVBHf6DWs4TVYLDbCz5Dw3NwFsm5SdnhyDOZI7Tt5pihusWjTSWUBkiZTi11NPXJN4o7+5q 3XyiNakD9nzjP895d/HTkGHbc/9gP321Wp72L0/3XDifndBv95EGeDMSd1C+1IdqSi5iFTBUV lDogv/dbn37ssdB2tuqcGkZjuHQp9HSlWXgvXGpaEyRms6ZeyE3MFHKENtke4SRU7fKkd2gP3 SVsPm7c6UYAs9ScsaUi/f0THXTBVcXst/zA3YoqdjISfz9Pso5sHTtRxACzRQiz5xfdOTDCOr Hnya4c5Mjdv08QPOAW4PHEVzM1OkdB+FnoX8Vw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These are all handled by the random driver, so instead of listing each ioctl, we can use the generic compat_ptr_ioctl() helper. Acked-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/char/random.c | 1 + fs/compat_ioctl.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) -- 2.20.0 diff --git a/drivers/char/random.c b/drivers/char/random.c index 5d5ea4ce1442..355dc54576f2 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -2106,6 +2106,7 @@ const struct file_operations random_fops = { .write = random_write, .poll = random_poll, .unlocked_ioctl = random_ioctl, + .compat_ioctl = compat_ptr_ioctl, .fasync = random_fasync, .llseek = noop_llseek, }; diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 10dfe4d80bbd..398268604ab7 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -439,13 +439,6 @@ COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT) COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT) COMPATIBLE_IOCTL(WDIOC_SETPRETIMEOUT) COMPATIBLE_IOCTL(WDIOC_GETPRETIMEOUT) -/* Big R */ -COMPATIBLE_IOCTL(RNDGETENTCNT) -COMPATIBLE_IOCTL(RNDADDTOENTCNT) -COMPATIBLE_IOCTL(RNDGETPOOL) -COMPATIBLE_IOCTL(RNDADDENTROPY) -COMPATIBLE_IOCTL(RNDZAPENTCNT) -COMPATIBLE_IOCTL(RNDCLEARPOOL) /* Misc. */ COMPATIBLE_IOCTL(PCIIOC_CONTROLLER) COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO)