Received: by 2002:ab2:7988:0:b0:1f4:b336:87c4 with SMTP id g8csp26365lqj; Thu, 11 Apr 2024 09:00:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUp74DnK+QoRuUj4J/QKtkSCc9R/Wmt/A8WfXpgPUC2rANkRAP2zckI4qzFDtjsTqNBOFzDu1aPof+PNYN84j87bmokGN/bucKG1DWG8g== X-Google-Smtp-Source: AGHT+IGQxo/jwvQovKg+83JvMDpJSn9psYRDSxi2QyTsABK6TXJCBK5r6jsNJP+yYBEcupklHv0S X-Received: by 2002:a17:90a:f308:b0:2a2:8828:c938 with SMTP id ca8-20020a17090af30800b002a28828c938mr5533257pjb.12.1712851231566; Thu, 11 Apr 2024 09:00:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712851231; cv=pass; d=google.com; s=arc-20160816; b=jpslUp5ugoBIVomksyTEli9gmYtNhZRG/lpP3Ve7CDbUDLN6rsOWi+WO4Pw6Yu7OMv cMJvgF6KSPVtqmh+cH2rdYOzpvzwpK3POBMHZ6FiIjeJq87gMvGzMrIOPa8k5jNYJyhJ /39mAKWqeyI9rwQjlHJrMIhH7FHCXdYD0/fir6N7PSHyNufGHwLBZVk94oTOzrQq+OHz JJf2CIUbIQrm7xjLBVfT55QY8+iGUb2hupIzIM4ylqa43dFRLs0AFRxHFjl6q3lVZoc4 74UyE1JLtlGYqCLGos9a7CRxfm9Z2oOLUuIY0esaXHOQqtGBEznAllap3eNtx2sSVhZA /PyA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=hI3XeuEqXSe5xAQxoRI1k1fUfRRMoYe2Nj0mBwtIi0U=; fh=2FInBIgEh7xt9W7JS1z2wQ7fUhvLHtwfAfkXluU3JoI=; b=E8gD6fG4zDdTEG1ZZmzNisUC5CHZ/3iJwj7LPyo95XozfRC9kBmUoL6aBF6IldMuL2 +lK2UD0b2LEAI3vAizhmRdaCWCyZiPddL6frxVhobMckj2zs6uxx5CZXQFXdmndEhWh5 Uh2cxWZzbwxl7Ucli9Ri75Dg9FSaMfgUCSrYG7GX0rn8bIU69ynqwIt0BtySgWYfrXJa Pw76EPf4PdE+0TUwiEGUEPSxO02HKfma3dbqA+rlKn6Ooy6ieLA4Hxxn/ZPsHisDDPq1 fDcU0edGFkK9OkuX7oMjZAnm7UyzPlaIZwHLnbiqqZUnTibPQfa3+sTDR8oTYK195S62 s7RA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=Ik19F6gy; arc=pass (i=1 spf=pass spfdomain=kernel.dk dkim=pass dkdomain=kernel-dk.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-140856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-140856-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z13-20020a63e54d000000b005e438e99d3fsi1466769pgj.124.2024.04.11.09.00.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 09:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-140856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=Ik19F6gy; arc=pass (i=1 spf=pass spfdomain=kernel.dk dkim=pass dkdomain=kernel-dk.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-140856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-140856-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 42C5F2817FB for ; Thu, 11 Apr 2024 16:00:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 835F11386AC; Thu, 11 Apr 2024 15:34:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="Ik19F6gy" Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7422D138495 for ; Thu, 11 Apr 2024 15:34:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849664; cv=none; b=UPTcStsCIv3n56UA32xnIsM9ceupPuHoEdSfPOI+S3/6SneQoHLmbWslWCtdgHUWJAGEwVujImEqCDHy1+KxpjBsqgWEvkubi1YA8XB6ugCgYs05n0UW4uonl968Z+S55EtiIRk59/wOe9bZxSEWg8PEX/f67/UdlPaSRAiVzwc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849664; c=relaxed/simple; bh=wipL4mL/eUvbX6HEd5vhA+QIcjWUcNKLmam46xT8Cxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I7tJDMKzAg2t7bAsNysHoNziwOQaz+SVL4dRYnzDWcdAlbvHRLIT8eVFsF7akEb/wHhbiXw6nw/D7dx1F09TzN/m+Gr8MqfN+oVXI7yhgWKYOBNh6tX8v4kPmlylaoPbCRMqwpC9c6HenZz1r6cT/12OEPZ/lxbJpjYFXBsfntA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=Ik19F6gy; arc=none smtp.client-ip=209.85.166.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-7d6812b37a6so8907939f.0 for ; Thu, 11 Apr 2024 08:34:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849662; x=1713454462; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hI3XeuEqXSe5xAQxoRI1k1fUfRRMoYe2Nj0mBwtIi0U=; b=Ik19F6gy49aLTfUrNt7Hem5ufKYpvdWEEZWvpg1/67ZiXPH49bGbJjFJQPyKEtxz2o cV2AVl421n6ABaWCuzZ9Cv5pzASxDyuRXF4UiHIzqes/KdF3LHjMB7Wd0PAJ6cYYkS84 3w17X0daPMOOEcmBrx0Y+ATCRSUgdojlzPmx7cCDoZ6A3qUbA+bDY4+6j41wjGIolumd dpp+DQ6YLLDY8jAd3A4lhhx+mKKu6kBABFBX75oxFqTOvtmMTCd/avGwozu0gWa7FUbw HU9zmBh/GWY6xbitrMtQyA7JS2PSQcaB3VvVbVH8JFD2iYEO7jsXRep0Jec6HcwgT3ZP oovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849662; x=1713454462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hI3XeuEqXSe5xAQxoRI1k1fUfRRMoYe2Nj0mBwtIi0U=; b=ARxY+556syhrwu810YlEkWdirsKbu2F2wWUSLqTiBbJDOrDnnhuF7q3vZT+356SK/j ZcSjG8HD7Zh7U32Bss2goMKkVAhpIbkGyPzQCUu8v4zKrZ3S15Cq1qBFNIjRH1kGEOjE 6nHtVgqtpZeWA5hcvr9d+WLNcM3zv/FfkazOkym5DwP16vnFAo/dqYWdzyYgq5QgziYP KngTXx5boW3kbjqDYmqvUTKAGhRIDMyS9/+/N+RDZ/buBwGg/zJleTGfK3+ZgC2GoG0v 8ObOOWmxm7QeYsO+5vbrYrg/FqZ5TgqgYDJ4zsWNNP3tiYCdzveVvDWdnwz4CTtPEkQH cbwA== X-Gm-Message-State: AOJu0YxcIg3Fbg6Ph5GC/Y1YWWb5Z5vzRU4iUwDtt5eXjtWHk4d7CxkI lIKnlUynIO1kv/M8VngpIVsq5s4SS4K0Fjy2otPw7Sm2aPulpdqPNKCWvMWf4WBtkSbxXPeEHw2 9 X-Received: by 2002:a05:6602:21d7:b0:7d6:9ddf:5095 with SMTP id c23-20020a05660221d700b007d69ddf5095mr9953ioc.1.1712849662442; Thu, 11 Apr 2024 08:34:22 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:34:20 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 094/437] lockdown: convert to read/write iterators Date: Thu, 11 Apr 2024 09:13:54 -0600 Message-ID: <20240411153126.16201-95-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk> References: <20240411153126.16201-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Jens Axboe --- security/lockdown/lockdown.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c index cd84d8ea1dfb..ea208d3251e6 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -93,8 +93,7 @@ static int __init lockdown_lsm_init(void) return 0; } -static ssize_t lockdown_read(struct file *filp, char __user *buf, size_t count, - loff_t *ppos) +static ssize_t lockdown_read(struct kiocb *iocb, struct iov_iter *to) { char temp[80]; int i, offset = 0; @@ -116,7 +115,7 @@ static ssize_t lockdown_read(struct file *filp, char __user *buf, size_t count, if (offset > 0) temp[offset-1] = '\n'; - return simple_read_from_buffer(buf, count, ppos, temp, strlen(temp)); + return simple_copy_to_iter(temp, &iocb->ki_pos, strlen(temp), to); } static ssize_t lockdown_write(struct file *file, const char __user *buf, @@ -146,10 +145,11 @@ static ssize_t lockdown_write(struct file *file, const char __user *buf, kfree(state); return err ? err : n; } +FOPS_WRITE_ITER_HELPER(lockdown_write); static const struct file_operations lockdown_ops = { - .read = lockdown_read, - .write = lockdown_write, + .read_iter = lockdown_read, + .write_iter = lockdown_write_iter, }; static int __init lockdown_secfs_init(void) -- 2.43.0