From patchwork Tue Apr 16 20:28:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162375 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4661583jan; Tue, 16 Apr 2019 13:29:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyV4AOMLXc+onebzC/OqF0stR13uCrOorBTydb3La+8p4imj+URr3RH/nraTCAys42wdowI X-Received: by 2002:a17:902:2bc9:: with SMTP id l67mr67290829plb.237.1555446540231; Tue, 16 Apr 2019 13:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555446540; cv=none; d=google.com; s=arc-20160816; b=yraJ5sIs53x5xWRDOchQJDDp8Uxj3iauUy61InhjVEFsutdP6L/bPIdI7HLbbxPxZb HsWtmuX073uYlzLQkeOufWqBdQ6m6zLYuA2WTiIlPHgXEeOv+eNPTKYl2+j3jrQNQYS0 GIse1aU5vr+stmL7aXDtwVLSCyKAzOh04wZis7bbg7eMSEOoNkOpa9xmQdNxSikjpTs1 T5bT+ZY8Nu14PhHTlEVP5DRF9SPWg2jMrN2ix/LR0UR50Br5uQDBmqh5WJpA4714lh9u vg5nAqSseiYBKrwDGep+lJKo46/qOKGHEKwrv0yJqEJw6raNXjexUvQsJcVmpLUOeYko CeXA== 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=66JXeRJ4HqQw42WAqbdaSCSYnixkO+X66BXAMiXdv4Y=; b=XUZrbRerTs4XrO7spOf7OWt2vzUJHYLcFgrWyI2B8y0RQxWqN4Adju79QcHDWlJzQt 9ok2IByN2IKgUtehrwBJdR6oZLc+/BF+Vx7MMBJHOIGL12qIc1GpFuPRj5LS4b4vjbUS vZrO5bYvXLZTNNMzuuJ/KZ1fuJG2pFg6PtpAeAnM1xGJ9jFipp6IvgE6ff8BNoJ8ypdm zxjyRqDW7wzIHWynNZcqdKUuDHbbN7UMbVnEX7k0pW1UJbrxYMzf8B8xuLL4xBWFYF2o qgq2Dw7Lj1xIKliQB3GtxOGApIMiegSTnbyqxheLeXOmv7KRkgM3RihwCumv6OFe7Oiq 688w== 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 l11si43578423pgg.554.2019.04.16.13.28.59; Tue, 16 Apr 2019 13:29:00 -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 S1730871AbfDPU26 (ORCPT + 30 others); Tue, 16 Apr 2019 16:28:58 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:43345 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730804AbfDPU2x (ORCPT ); Tue, 16 Apr 2019 16:28:53 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mbzhv-1giFg71QTf-00dao0; Tue, 16 Apr 2019 22:28:48 +0200 From: Arnd Bergmann To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , "Theodore Ts'o" Subject: [PATCH v3 22/26] compat_ioctl: remove /dev/random commands Date: Tue, 16 Apr 2019 22:28:07 +0200 Message-Id: <20190416202839.248216-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190416202839.248216-1-arnd@arndb.de> References: <20190416202013.4034148-1-arnd@arndb.de> <20190416202839.248216-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:jA89eqKnRPmlOtnlgpKIzUdW+gr3sTm2sk1VYxigi/oVU0N+G51 0yLOK85iHW8gxA8PYZiCGw8y/mYMEGZXPu0hhwB/nJ7lk40rQeu99bZ+GnYqZROIRSDnj5G DuFwuOB+9o2MaekeHCiHSGB462Rhu0iMTrViAbpxpib4GwudUebC6fEEeM6OPZ+MaDFcUt4 wPXTUJTIzS5je+gbuQyzA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:CHYFpmqHt7I=:IW5eUkhGK4i+y9MkToJnzi wbKi29WpRLt+kIO9iXBAUUBx1iJ1WywiCib18wfeMU4W9cjY4ZQpfjmFs3y8fRjTw4ZvEJktT fWVJ9BUklJJ6sO4uCCo7b33pEAeOTJ17ZeJjADc+a6n3lw10DutWFVJkNTiHglIW9tkV8IrMT p9wL/CHrYlFN1K9pJwiZKPOGyaSdsbKCIBElAXjNIQ/JuCJRF5p7pf5u4KSszUAqV1jThifSm YshwVhwVTj7ZtK0p7bVsjQ3DARc2CQD5Aklu9x4/4EOKmbAQuRSMzITpRrg391Ar3CGCJUr1x xVFLE1SdoUaegHSb2ics8kqh83q3GSsAZhThmyqUa2NU4qzmHL82z0I4E7NCSqc3tNcW12225 ydkTLOAdh6fIBhBvesE225gMv+2QFtlryTKzYBrKc2/U1WEMLfMp8gXKrRNXvxk6Xr99fjmY8 TkETFcV3362QHhVMy45weAKDImPujFkFnShbvhGbRK2WIndhNhBvreSUi6KbpmpTv8Wy4YI0t VeGtW6TuG/QI2+2nPn8TRAcnWXGPtuydquHDBcWIgs43hsALWLhlsEcjO+DelsRZ6pyPC1PDG /pTqjFOx4gvWo0KAJqQ/psJ7T7yWABp/IYfNmnB4igb5uCvO7PHU0gXqkBmVK0TZ2wavgO4eJ 1OrLkVhwKSZog+g5rP+8GTmR8+AjndhIeNq3Jk+YBdiSD6CPG7oeRAxv5ty9kK0FGiUp0LIjt nXw+upVecaRMNlkqVuUZbrkKaCjs+DoBv0IhNA== 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 just use the same function to deal with both native and compat commands. 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 38c6d1af6d1c..4f397c70d89b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -2025,6 +2025,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 bae7b38a881f..78144a599f36 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -380,13 +380,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)