From patchwork Mon Nov 23 23:54:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 11926869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 560BD90 for ; Mon, 23 Nov 2020 23:54:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2675D20724 for ; Mon, 23 Nov 2020 23:54:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rX3Q/KMP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727412AbgKWXyh (ORCPT ); Mon, 23 Nov 2020 18:54:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727372AbgKWXyg (ORCPT ); Mon, 23 Nov 2020 18:54:36 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E1BBC0613CF for ; Mon, 23 Nov 2020 15:54:35 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id r3so2230286wrt.2 for ; Mon, 23 Nov 2020 15:54:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZB3RzTtOX5Vi4wJPeUnMotilF2kP22sMOQsBxc6+YQs=; b=rX3Q/KMPxyAVPoYlG/3ex3KT+pJZzoCmRUPGxMABV+0J6MCzg40pmf24cvQC73ClD/ egCSQKk2ZVgLtnEoLw8RjKCX6TrsLh4F+L+FSHwbv9LhIn8UyzGSiuf+3RVQBsCFeTqs 6vYNqHgCxUvvNBZUo7a91GgGX3utvoFurF3zW+nobJzb+2JHT7dEMXZVAMadQu4871FL tqzOVWPDQDlF4+q3eyEYCzYRhXgDVwY5juYAe5F7Br85R9rvKMXolbs8hcr6y3zXVILR ijGnVWOGhA4ugHKpQU5m/piWwr2UWn70UpOHaHaRxIMlX2ra3vihp3t4wiAa/qdh4ULY pmgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZB3RzTtOX5Vi4wJPeUnMotilF2kP22sMOQsBxc6+YQs=; b=Nrzqw2tsNZZIY4NI9TIDc0wPbqwM7xAV2ZmgHTOtA54RDLYG3Rk2lBJoDtpuBPkSy9 Sw1LAbQ9ubbax3rGsDQAaU/xXjPQAd9NeCSpIONbQarTLVAgZUvthOa0pKV/FeBf3SdV V87AxSlMLkXgiCVlchfCGfTcOGS+SoPFlz/GgFkdt+iB9weicRussZ9GjSQAT66gQunD Tuo3s9dbPiWEpn6AoGSYiwxFERsN/Ep1jZmago6EH1B58U7fsSsxZ/s5yBE1NGY9ZVXS 9kWX4Mak2h98C/Ow3huGZzxFOT48r5Qxh7lorYlBcaYjL6shlt3N/feC+pKEqIrNutqz yAgQ== X-Gm-Message-State: AOAM530p1was+0zMLDYPubJV+LVU5RlxUebWWL0SueBImVRhuVvWB68E XoEC52aRUGTa2vzzoCQgS9K/9g== X-Google-Smtp-Source: ABdhPJwsyTAO+I0Qh+xGi5SqAtchc9g2tyh6CpqTZsdoVWlMyoEVUO+GzF8teUGJN6bMS4ndcE5NGw== X-Received: by 2002:adf:f5c8:: with SMTP id k8mr2230194wrp.2.1606175673552; Mon, 23 Nov 2020 15:54:33 -0800 (PST) Received: from localhost ([2a02:168:96c5:1:55ed:514f:6ad7:5bcc]) by smtp.gmail.com with ESMTPSA id z6sm1704751wmi.1.2020.11.23.15.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 15:54:32 -0800 (PST) From: Jann Horn To: David Howells , Jarkko Sakkinen Cc: keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] keys: Remove outdated __user annotations Date: Tue, 24 Nov 2020 00:54:00 +0100 Message-Id: <20201123235400.1609970-1-jannh@google.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org When the semantics of the ->read() handlers were changed such that "buffer" is a kernel pointer, some __user annotations survived. Since they're wrong now, get rid of them. Fixes: d3ec10aa9581 ("KEYS: Don't write out to userspace while holding key semaphore") Signed-off-by: Jann Horn --- security/keys/keyring.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: d5beb3140f91b1c8a3d41b14d729aefa4dcc58bc diff --git a/security/keys/keyring.c b/security/keys/keyring.c index 14abfe765b7e..977066208387 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -452,7 +452,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m) struct keyring_read_iterator_context { size_t buflen; size_t count; - key_serial_t __user *buffer; + key_serial_t *buffer; }; static int keyring_read_iterator(const void *object, void *data) @@ -479,7 +479,7 @@ static int keyring_read_iterator(const void *object, void *data) * times. */ static long keyring_read(const struct key *keyring, - char __user *buffer, size_t buflen) + char *buffer, size_t buflen) { struct keyring_read_iterator_context ctx; long ret; @@ -491,7 +491,7 @@ static long keyring_read(const struct key *keyring, /* Copy as many key IDs as fit into the buffer */ if (buffer && buflen) { - ctx.buffer = (key_serial_t __user *)buffer; + ctx.buffer = (key_serial_t *)buffer; ctx.buflen = buflen; ctx.count = 0; ret = assoc_array_iterate(&keyring->keys,