From nobody Fri Dec 19 17:00:21 2025 Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (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 4EB4A15AACD for ; Thu, 11 Apr 2024 15:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849716; cv=none; b=AP+a7d1BnVxft15jj4pdl6cDnLP6frE44AJdMEHIa0icvs2AudAUUXTWUTeYPYh+mGpAsa1xrMDnO78QXG7PEa6Tu7ZspzXs7HYMBSfBsyWcwe9Cf2x7MYa+Dn+rXnGZffpfelw8NKlR+M7pcwJVj+x0D1sZOinYs+5HxVIzaMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849716; c=relaxed/simple; bh=BKU7jof+OLPW14KMY7IUBGAnl4D7CJ5njhnuIagmstA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBUeF5BWL4kxR4uFZuQhTcNmObENwo+qN1M3oWnRkHrO/u9Xh25E4NSpN/ATlxqiq8vt5TsA+sGMgkZCBZGI/+Ptu06XkHh4Af9mpAQvkL/PpwKYDtQ9NnLZsqZUKgH6As+3fEd6akecByOsIzcpgipBlxUqknGncpzDklCaPgY= 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=sMsFZIB2; arc=none smtp.client-ip=209.85.166.175 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 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="sMsFZIB2" Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-36a224d7414so180795ab.1 for ; Thu, 11 Apr 2024 08:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849714; x=1713454514; 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=FaP4jRALl7uM/aiEEtjEUM+QWpiHHwuYIJyLofUvW+Q=; b=sMsFZIB2AZHZPIBvJ/Ist+F/Q+awIJWmzY+BuHwyFylVpmRBo8zgMhMYdeJIk66sdH oFpHiFl8sL5YDsYwwqeBoYAvqIOcVA14KuG850zl8wiqbozxb41wm+RN7VAyXBduKe/u 237t3NHwi9CALBaR+W4UpW58nU+Qkx9fjQCu1733O4O9ihWJ2UzPnUA9dhtPX4QF9fRE YAScuQKc156CbMP3QXPmGP0gt/RtpCjS02JX765XmdfVt50SgTOIbOshfnlfMQ1lQ6p9 f/YckfPObIONBKKLup2lBaRrCUfmA1skSYzB7xluAz54LRBARkITdLeTTGb3hVTTPgm+ HzzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849714; x=1713454514; 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=FaP4jRALl7uM/aiEEtjEUM+QWpiHHwuYIJyLofUvW+Q=; b=GExldM1E2CF6rNy1gquMjSRsUfHfFNna2UnMhlnB2L4a7Y4rW2qUCTKzqyqP3vo6zI i2YS/p7BlzDt42xpCFAG4z4WOGOMPsgeXhbeuf7oGgkxrXBlc/JQ5X8sjf4o66QJOQGe LqsWw7ppsQPMSn19//qvgVycbzSz48JODfdMvvvaiEcuaEVNN0IXT92s8+w072N8DAXe q0xmVv70IKV4levE6V3QO9H8qKn6/O4BZEQQxeAioRV29SeXoF7XCIBVkgO0R+zvcEU2 xlZsEVcH6zl/54lLh2VbB3RG8B8Qk8dw7GfUlfkxevzi3TDvGGz5W0IR5kVc6QmJV4O1 Ui9Q== X-Gm-Message-State: AOJu0YyuAlpOT7bps37+835kqecCwvYzVTJ6n52OAct6finI4uHyGUGU OY4MLlo6rdBOI7wfMyChuUv943MT/B/iNTDgrHtzQQgS9U+inTv50mmmvSJzaF63WzfgdWzwktM z X-Google-Smtp-Source: AGHT+IGI4Hiat6KzThSe7lYDUcFVZjVO8E/QRRg2id5JzH/Naow20qyWfGR6lmCto4fro8Xk/4dfYA== X-Received: by 2002:a05:6602:4ed7:b0:7d5:ddc8:504d with SMTP id gk23-20020a0566024ed700b007d5ddc8504dmr186123iob.0.1712849714247; Thu, 11 Apr 2024 08:35:14 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:35:12 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 126/437] firmware: efi: convert to read/write iterators Date: Thu, 11 Apr 2024 09:14:26 -0600 Message-ID: <20240411153126.16201-127-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: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Jens Axboe --- drivers/firmware/efi/capsule-loader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/c= apsule-loader.c index 97bafb5f7038..9b1d143a64f6 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -149,10 +149,8 @@ static ssize_t efi_capsule_submit_update(struct capsul= e_info *cap_info) /** * efi_capsule_write - store the capsule binary and pass it to * efi_capsule_update() API - * @file: file pointer - * @buff: buffer pointer - * @count: number of bytes in @buff - * @offp: not used + * @iocb: metadata for IO + * @from: buffer pointer * * Expectation: * - A user space tool should start at the beginning of capsule binary and @@ -165,11 +163,11 @@ static ssize_t efi_capsule_submit_update(struct capsu= le_info *cap_info) * - An EFI capsule header must be located at the beginning of capsule * binary file and passed in as first block data of write operation. **/ -static ssize_t efi_capsule_write(struct file *file, const char __user *buf= f, - size_t count, loff_t *offp) +static ssize_t efi_capsule_write(struct kiocb *iocb, struct iov_iter *from) { int ret; - struct capsule_info *cap_info =3D file->private_data; + struct capsule_info *cap_info =3D iocb->ki_filp->private_data; + size_t count =3D iov_iter_count(from); struct page *page; void *kbuff =3D NULL; size_t write_byte; @@ -202,7 +200,7 @@ static ssize_t efi_capsule_write(struct file *file, con= st char __user *buff, =20 /* Copy capsule binary data from user space to kernel space buffer */ write_byte =3D min_t(size_t, count, cap_info->page_bytes_remain); - if (copy_from_user(kbuff, buff, write_byte)) { + if (!copy_from_iter_full(kbuff, write_byte, from)) { ret =3D -EFAULT; goto fail_unmap; } @@ -307,7 +305,7 @@ static int efi_capsule_open(struct inode *inode, struct= file *file) static const struct file_operations efi_capsule_fops =3D { .owner =3D THIS_MODULE, .open =3D efi_capsule_open, - .write =3D efi_capsule_write, + .write_iter =3D efi_capsule_write, .release =3D efi_capsule_release, .llseek =3D no_llseek, }; --=20 2.43.0