From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.163.139.74 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794866911; b=4uR4LVmdHIQCEYpyI8g6En9NpL8aqF8Pe7W5eylFrgojb7PKMSsKrkTc+zXUqEWSUhwm 52ez2u6q0AnBCEYA+gPa/nDkOx9DMRbdBS53vxYZbVOqd+Xzg7v9osDjVCygciKZIkh0P x4am3/6sCdFHuQ0WLqOlyJC9i7BtbkXcnnxZYtx4VZXe8u+wlrEHalFi5PpqcE1+cSGm9 DEWbxYLhv6xXrOtqcwpWbch66gjTVtbBnCd1/uX4GUp0grmmzwthNUARbc+0mLEDKz+OX Ku0N5MzqiXLYUaIRgEhPWINIBn0takMvIKUWhFpHFHPvCpZWL72e7bmKWQ2bZfwUYMg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794866911; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Proofpoint-ORIG-GUID: X-Proofpoint-Spam-Info:X-Authority-Analysis: X-Proofpoint-Spam-Details-Enc:X-Proofpoint-GUID: X-Proofpoint-Virus-Version:X-Proofpoint-Spam-Details; bh=TLCucmL89h6Y343vyk/BSzJ/L9xsssqYgiwpO26BJsY=; b=SpXORQljrtkTM8FckZ+YetIzqnASlpGiaerKNnmx+kWmcEV+c1zeTHD8kIGczXrzNLIR RnY6YquZhzYDvy+OYdhF5QhceEIJOFiZIwGfMEWM3cDJke1mDZoyyr3qEWgDVWMW6/pDD R9/YELm4547I40jKl6KLjVOWP+1jupARTfuU3SByWAZnd5gtt1ijvhRgKjSGsgwSW2tEq A6kUHT7eenFsZVPKtxwQLG0vnUMdcpEywqlte7AJ69ykul9gbVQakTgLy3dg/0Uh/TFqH Gs4XkvkIzcziiaDmVsdIDpyc6H0KIF7jlvvgQtpotq7k495zLVNuGJrZKVMytkPYYtQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=pps01 header.b="V/iJtvKs"; dkim=pass header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=lionmail header.b=KrNP6RGx; arc=none smtp.remote-ip=148.163.139.74 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B089606A89D for ; Mon, 16 Nov 2026 22:08:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5B089606A89D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=pps01 header.b=V/iJtvKs; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=lionmail header.b=KrNP6RGx Received: from pps.filterd (m0167075.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AGLYmlU3766724 for ; Mon, 16 Nov 2026 17:08:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=TLCu cmL89h6Y343vyk/BSzJ/L9xsssqYgiwpO26BJsY=; b=V/iJtvKsucsaaPCKMQEs 7cAgW/QX+5U2qrxAettTu2ao5x5ENVLGBA7JLqtL2VkdUKYsWR0pd8WNOKqxb01E WrOdPa4k4azpVBhDxOsxya1rK7+QA6FNcFvIrFXuAo/GeOnZnuMZcWqKyYWEu4z+ cRjRYZSnhKJ2JCKS9L/srDZIcpb7rJw0ypTqxT8PO1iTF2eoMq3zOQM2NFvNgUc4 vzMd1RFhCs8Q3xtsRssYNeVfyRwEHT/y727mzY0r3Tcx2tDLcZdnWPkggPNV6v3W 01bY6wkCEGy7MKtaTQtCSOKOmCo2negCmJkwPw0rHvRvv9vf7psfDAt1R+qIgef/ DQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4j0598b9pf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Nov 2026 17:08:29 -0500 (EST) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-93f2005ce21so724593885a.3 for ; Mon, 16 Nov 2026 14:08:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1794866909; x=1795471709; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TLCucmL89h6Y343vyk/BSzJ/L9xsssqYgiwpO26BJsY=; b=KrNP6RGxdLoTead7NEFi0lGMHPcsB6RPA2kNwFvxiA3d4ScbcFCMFkati2KuVQswOb M340mQ1Eo+jrDVUZCFYrJ7sQMpGhhouE6shyescpxDKRX2BPo1MLS2AuM0Z3+x5TstoI QmRwE/5F2eh2hqTDriSyRwLf+EEjXKZNeWkCBjBXFz6BlkhCrfPw+haxIC5SyqkPZynT Lj0IugJ3/bvACTLue1xVKjo8Er+IhkwBo3s3PDuG+8uMrfo2HyrN8C01GCbSgoy7YNwK V9jimKW2KunrIexnaRN9R3DjfDbnRlGWk1OL2Cu3ZQGbL0KDp/UUcKSFP4WKHZKDhRGT AktA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794866909; x=1795471709; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TLCucmL89h6Y343vyk/BSzJ/L9xsssqYgiwpO26BJsY=; b=HksX5+PuHffUXmNdx8NukimZe/hlhlejpv1TY52ZmBPTfzu2I/pPAnmGj1GExemO8b rByoEKHRwbF57GMP6WBXNFQ3gO5QbiSa5G2mACnPLPYOnkS5iWwQcMFDp6AJEHEt9WlD yP3r+355e9ELlA+jU/U9vUB1nEdXJ2EPBpPRq9bWAvFGleR0Xb0AWOGagwZrgxkDJsNs CED5PO+IplRqMKCJT6rOOk6+RUZwtRBckO2WycFj8Bn3R9aYVTgEuuxbWAtX2hjWLYRz VfhYcsXIEsncgxibDhZdOC2LiisVYdh+VwsB6mRKiMoz/mxjiDgWXGKgt1UH6OTQ1IcF vvPQ== X-Forwarded-Encrypted: i=1; AL+hErGKtLSnpCemcHieT+JeHEiA1XqiVhJbwTQl706bKUNiTckEqoMWC8p+hOoAsRar41BNPXLSHJVJiMwhXtM=@vger.kernel.org X-Gm-Message-State: APuU4Z8XKjMd4DpuJlLowmz+AK47BkaQRdw+nEtiSriVhJ74HF9jkuGG z7pibs9+Lc+yqbTsz5ppWi6p8RshU0YVGGixquS4C+Tv9rtGRA4Qz6kbsrm/Bt5C3ULjJxYBfi1 l+EJ1yiEYFwEwoankBUWsoHCw/xAmAYUEVbQidhrAil3mxcyEHfdbmaB9a/EsVA== X-Gm-Gg: AYBFou3QQa+AGohCHSrIh8b+FSLYeOEv3ifPxuis8r7XlStK5fPTWlq0gOdXhzmWEbW VOnR9vGKC1StirFzmbFRbuDG/5yufhvUHz6niit8z3bUsZ3ci0VgJkfkLjScDYKt1ddML/TsK7f tW5QkO6/5WpsuVXJsCJzQpPIbecJuM1u4p1uIRLZSHEMp9dKWMBUdgSz170CmSyhAFUZUIpcIoy y6RuWUtBHvDmMIhXW3TzfeIdeOkMn/1czNFPDL/GC/8+atDSbHjClOliT2kCK2C7KpcESyaLaVn dngE+9PuzaPxsEnDWSIHCQgwiVuEXb6wJNPtEwkdBcRhi/3AjDZw8q45FoLDG50hoOupWpppAoM FUQ0vUACjSOlu+hYt1mRWk88Wy7bAiBN2oTKkK62RF8xVyxe1WuBkPUWVCqf/Tmwj4nTdLYDBGO zdfIvTeXiluh1deZ/ctaWg X-Received: by 2002:a05:620a:6c84:b0:93f:3120:6c71 with SMTP id af79cd13be357-9494bbf73afmr1926074385a.44.1794866908665; Mon, 16 Nov 2026 14:08:28 -0800 (PST) X-Received: by 2002:a05:620a:6c84:b0:93f:3120:6c71 with SMTP id af79cd13be357-9494bbf73afmr1926071385a.44.1794866908184; Mon, 16 Nov 2026 14:08:28 -0800 (PST) Received: from [127.0.1.1] (nat-128-59-176-174.net.columbia.edu. [128.59.176.174]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9494c86c946sm951838885a.25.2026.11.16.14.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 14:08:27 -0800 (PST) From: Tal Zussman Date: Mon, 16 Nov 2026 17:08:13 -0500 Subject: [PATCH v3 07/10] ecryptfs: use sg_init_one() instead of virt_to_scatterlist() X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261116-ecryptfs-folio-v3-7-1aba8e620eda@columbia.edu> References: <20261116-ecryptfs-folio-v3-0-1aba8e620eda@columbia.edu> In-Reply-To: <20261116-ecryptfs-folio-v3-0-1aba8e620eda@columbia.edu> To: Tyler Hicks , Erez Zadok , Phillip Hellewell , Badari Pulavarty , Theodore Ts'o , Andrew Morton Cc: ecryptfs@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthew Wilcox (Oracle)" , Stephan Mueller , Adrian Bunk , Michael Halcrow , Randy Dunlap , Tal Zussman X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1794866899; l=11895; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=VlDnCX3i7mGZvNYBW4J8FKMLFtRDtsIQljRKRABgp+k=; b=s5+wznyEl0etqn7N9GmLoLd98/pE/hX/In0QQ5lbf24GS5AOeUELrxVhkLWpOCeZhoUCid9f5 NhU2F76jv5iAP2umHErTy6nvEGUMc2lJkh3XxExamHBeIRg+o8hqjcQ X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-ORIG-GUID: 8wryiOl3P3LtWt6RFzefWfgOyzOtf2Wy X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE2MDA4OCBTYWx0ZWRfX5Gn5UhIB3Y3c jPyqkgLtck5fa992kGfFMUF0DYWbrNDL+wRfOxQkZYSucJQLzabi+TBcMnMHVLaRvi6wpSnimY3 ImHV0lmFHlT+rjK6IPHbL+PduW5YN5O9OaSxf8aSKpFVaOpWDlPp X-Authority-Analysis: v=2.4 cv=aYD0Dhot c=1 sm=1 tr=0 ts=6afb7edd cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=KPY1cyGZ6h6m4ASiENTC8Q==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=HpS3TJQ9O3Ob1ozEcmik:22 a=rhbNDiOmHe9WM6CdvIYA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE2MDA4OCBTYWx0ZWRfX0qY0c6iM2jPi Am6lR0dPpSzzE250CNwTuRLKq0YrNv9yH28QlvBZU295ABeNuY8m/TwpUihsqgv9M4vCUfstUtS cDjUf96hMo5Ta/PNXM9qC+8vwOYWkkl0h9j21dH7ZQamb34Nx5D14OB66ZMHe4qieIa59mg6zSX DQ12JwTng8E/4cGCFBMONrkpW+pHc24zCWzcXzseqsm1E3xTlpdQEVik5YhANtUDYuHQ7fsXdTf JjqkQCYLBrd+pog3mI63CwZWIVDH9eLNuH/tHHeQslKgpxM1Ke0YRW881u09afL7rwT5vkfIKaD 7SFpi4e+SMjJNSHCTcGM4IUscyMO4zhuZzLncbsrxATtX1kllTg6UemeFY/M3xmXJg9nUGhrUtB 634hAdLh77mFXlJ7dCtVt8fR0KjeGmdFnnv2o7bNAEHfeY8Z1bnFrsnsBqatKmZNf+BAdqS85ft YUPfqxGD4pZtPnF/vBw== X-Proofpoint-GUID: 8wryiOl3P3LtWt6RFzefWfgOyzOtf2Wy X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11968 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=10 lowpriorityscore=10 adultscore=0 suspectscore=0 spamscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 bulkscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611160088 Every caller passes a kmalloc()-ed buffer or an array inside a kmalloc()-ed structure, which is physically contiguous and so fits in one scatterlist entry. Use sg_init_one(), which can't fail, drop the two-entry arrays and their length checks, and remove virt_to_scatterlist() and the unused ECRYPTFS_MAX_SCATTERLIST_LEN. Signed-off-by: Tal Zussman --- fs/ecryptfs/crypto.c | 46 ----------------- fs/ecryptfs/ecryptfs_kernel.h | 2 - fs/ecryptfs/keystore.c | 114 +++++++++--------------------------------- 3 files changed, 25 insertions(+), 137 deletions(-) diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 6a014872e919..f0e67b48917f 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -149,50 +149,6 @@ void ecryptfs_destroy_mount_crypt_stat( memset(mount_crypt_stat, 0, sizeof(struct ecryptfs_mount_crypt_stat)); } -/** - * virt_to_scatterlist - * @addr: Virtual address - * @size: Size of data; should be an even multiple of the block size - * @sg: Pointer to scatterlist array; set to NULL to obtain only - * the number of scatterlist structs required in array - * @sg_size: Max array size - * - * Fills in a scatterlist array with page references for a passed - * virtual address. - * - * Returns the number of scatterlist structs in array used - */ -int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, - int sg_size) -{ - int i = 0; - struct page *pg; - int offset; - int remainder_of_page; - - sg_init_table(sg, sg_size); - - while (size > 0 && i < sg_size) { - pg = virt_to_page(addr); - offset = offset_in_page(addr); - sg_set_page(&sg[i], pg, 0, offset); - remainder_of_page = PAGE_SIZE - offset; - if (size >= remainder_of_page) { - sg[i].length = remainder_of_page; - addr += remainder_of_page; - size -= remainder_of_page; - } else { - sg[i].length = size; - addr += size; - size = 0; - } - i++; - } - if (size > 0) - return -ENOMEM; - return i; -} - /** * crypt_scatterlist * @crypt_stat: Pointer to the crypt_stat struct to initialize. @@ -438,8 +394,6 @@ int ecryptfs_decrypt_page(struct folio *folio) return rc; } -#define ECRYPTFS_MAX_SCATTERLIST_LEN 4 - /** * ecryptfs_init_crypt_ctx * @crypt_stat: Uninitialized crypt stats structure diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index d828040ade89..301744f0f819 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h @@ -544,8 +544,6 @@ int ecryptfs_encrypt_and_encode_filename( struct ecryptfs_mount_crypt_stat *mount_crypt_stat, const char *name, size_t name_size); void ecryptfs_dump_hex(char *data, int bytes); -int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, - int sg_size); int ecryptfs_compute_root_iv(struct ecryptfs_crypt_stat *crypt_stat); void ecryptfs_rotate_iv(unsigned char *iv); void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat); diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index a0989e3c8aef..b147ddb0055d 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -602,8 +602,8 @@ struct ecryptfs_write_tag_70_packet_silly_stack { struct mutex *tfm_mutex; char *block_aligned_filename; struct ecryptfs_auth_tok *auth_tok; - struct scatterlist src_sg[2]; - struct scatterlist dst_sg[2]; + struct scatterlist src_sg; + struct scatterlist dst_sg; struct crypto_skcipher *skcipher_tfm; struct skcipher_request *skcipher_req; char iv[ECRYPTFS_MAX_IV_BYTES]; @@ -758,24 +758,9 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, } memcpy(&s->block_aligned_filename[s->num_rand_bytes], filename, filename_size); - rc = virt_to_scatterlist(s->block_aligned_filename, - s->block_aligned_filename_size, s->src_sg, 2); - if (rc < 1) { - printk(KERN_ERR "%s: Internal error whilst attempting to " - "convert filename memory to scatterlist; rc = [%d]. " - "block_aligned_filename_size = [%zd]\n", __func__, rc, - s->block_aligned_filename_size); - goto out_free_unlock; - } - rc = virt_to_scatterlist(&dest[s->i], s->block_aligned_filename_size, - s->dst_sg, 2); - if (rc < 1) { - printk(KERN_ERR "%s: Internal error whilst attempting to " - "convert encrypted filename memory to scatterlist; " - "rc = [%d]. block_aligned_filename_size = [%zd]\n", - __func__, rc, s->block_aligned_filename_size); - goto out_free_unlock; - } + sg_init_one(&s->src_sg, s->block_aligned_filename, + s->block_aligned_filename_size); + sg_init_one(&s->dst_sg, &dest[s->i], s->block_aligned_filename_size); /* The characters in the first block effectively do the job * of the IV here, so we just use 0's for the IV. Note the * constraint that ECRYPTFS_FILENAME_MIN_RANDOM_PREPEND_BYTES @@ -794,7 +779,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, mount_crypt_stat->global_default_fn_cipher_key_bytes); goto out_free_unlock; } - skcipher_request_set_crypt(s->skcipher_req, s->src_sg, s->dst_sg, + skcipher_request_set_crypt(s->skcipher_req, &s->src_sg, &s->dst_sg, s->block_aligned_filename_size, s->iv); rc = crypto_skcipher_encrypt(s->skcipher_req); if (rc) { @@ -830,8 +815,8 @@ struct ecryptfs_parse_tag_70_packet_silly_stack { struct mutex *tfm_mutex; char *decrypted_filename; struct ecryptfs_auth_tok *auth_tok; - struct scatterlist src_sg[2]; - struct scatterlist dst_sg[2]; + struct scatterlist src_sg; + struct scatterlist dst_sg; struct crypto_skcipher *skcipher_tfm; struct skcipher_request *skcipher_req; char fnek_sig_hex[ECRYPTFS_SIG_SIZE_HEX + 1]; @@ -950,15 +935,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, goto out; } mutex_lock(s->tfm_mutex); - rc = virt_to_scatterlist(&data[(*packet_size)], - s->block_aligned_filename_size, s->src_sg, 2); - if (rc < 1) { - printk(KERN_ERR "%s: Internal error whilst attempting to " - "convert encrypted filename memory to scatterlist; " - "rc = [%d]. block_aligned_filename_size = [%zd]\n", - __func__, rc, s->block_aligned_filename_size); - goto out_unlock; - } + sg_init_one(&s->src_sg, &data[(*packet_size)], + s->block_aligned_filename_size); (*packet_size) += s->block_aligned_filename_size; s->decrypted_filename = kmalloc(s->block_aligned_filename_size, GFP_KERNEL); @@ -966,15 +944,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, rc = -ENOMEM; goto out_unlock; } - rc = virt_to_scatterlist(s->decrypted_filename, - s->block_aligned_filename_size, s->dst_sg, 2); - if (rc < 1) { - printk(KERN_ERR "%s: Internal error whilst attempting to " - "convert decrypted filename memory to scatterlist; " - "rc = [%d]. block_aligned_filename_size = [%zd]\n", - __func__, rc, s->block_aligned_filename_size); - goto out_free_unlock; - } + sg_init_one(&s->dst_sg, s->decrypted_filename, + s->block_aligned_filename_size); s->skcipher_req = skcipher_request_alloc(s->skcipher_tfm, GFP_KERNEL); if (!s->skcipher_req) { @@ -1014,7 +985,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, mount_crypt_stat->global_default_fn_cipher_key_bytes); goto out_free_unlock; } - skcipher_request_set_crypt(s->skcipher_req, s->src_sg, s->dst_sg, + skcipher_request_set_crypt(s->skcipher_req, &s->src_sg, &s->dst_sg, s->block_aligned_filename_size, s->iv); rc = crypto_skcipher_decrypt(s->skcipher_req); if (rc) { @@ -1632,8 +1603,8 @@ static int decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, struct ecryptfs_crypt_stat *crypt_stat) { - struct scatterlist dst_sg[2]; - struct scatterlist src_sg[2]; + struct scatterlist dst_sg; + struct scatterlist src_sg; struct mutex *tfm_mutex; struct crypto_skcipher *tfm; struct skcipher_request *req = NULL; @@ -1655,28 +1626,12 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, crypt_stat->cipher, rc); goto out; } - rc = virt_to_scatterlist(auth_tok->session_key.encrypted_key, - auth_tok->session_key.encrypted_key_size, - src_sg, 2); - if (rc < 1 || rc > 2) { - printk(KERN_ERR "Internal error whilst attempting to convert " - "auth_tok->session_key.encrypted_key to scatterlist; " - "expected rc = 1; got rc = [%d]. " - "auth_tok->session_key.encrypted_key_size = [%d]\n", rc, - auth_tok->session_key.encrypted_key_size); - goto out; - } + sg_init_one(&src_sg, auth_tok->session_key.encrypted_key, + auth_tok->session_key.encrypted_key_size); auth_tok->session_key.decrypted_key_size = auth_tok->session_key.encrypted_key_size; - rc = virt_to_scatterlist(auth_tok->session_key.decrypted_key, - auth_tok->session_key.decrypted_key_size, - dst_sg, 2); - if (rc < 1 || rc > 2) { - printk(KERN_ERR "Internal error whilst attempting to convert " - "auth_tok->session_key.decrypted_key to scatterlist; " - "expected rc = 1; got rc = [%d]\n", rc); - goto out; - } + sg_init_one(&dst_sg, auth_tok->session_key.decrypted_key, + auth_tok->session_key.decrypted_key_size); mutex_lock(tfm_mutex); req = skcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { @@ -1699,7 +1654,7 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, rc = -EINVAL; goto out; } - skcipher_request_set_crypt(req, src_sg, dst_sg, + skcipher_request_set_crypt(req, &src_sg, &dst_sg, auth_tok->session_key.encrypted_key_size, NULL); rc = crypto_skcipher_decrypt(req); @@ -2173,8 +2128,8 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, size_t i; size_t encrypted_session_key_valid = 0; char session_key_encryption_key[ECRYPTFS_MAX_KEY_BYTES]; - struct scatterlist dst_sg[2]; - struct scatterlist src_sg[2]; + struct scatterlist dst_sg; + struct scatterlist src_sg; struct mutex *tfm_mutex = NULL; u8 cipher_code; size_t packet_size_length; @@ -2249,27 +2204,8 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, ecryptfs_printk(KERN_DEBUG, "Session key encryption key:\n"); ecryptfs_dump_hex(session_key_encryption_key, 16); } - rc = virt_to_scatterlist(crypt_stat->key, key_rec->enc_key_size, - src_sg, 2); - if (rc < 1 || rc > 2) { - ecryptfs_printk(KERN_ERR, "Error generating scatterlist " - "for crypt_stat session key; expected rc = 1; " - "got rc = [%d]. key_rec->enc_key_size = [%zd]\n", - rc, key_rec->enc_key_size); - rc = -ENOMEM; - goto out; - } - rc = virt_to_scatterlist(key_rec->enc_key, key_rec->enc_key_size, - dst_sg, 2); - if (rc < 1 || rc > 2) { - ecryptfs_printk(KERN_ERR, "Error generating scatterlist " - "for crypt_stat encrypted session key; " - "expected rc = 1; got rc = [%d]. " - "key_rec->enc_key_size = [%zd]\n", rc, - key_rec->enc_key_size); - rc = -ENOMEM; - goto out; - } + sg_init_one(&src_sg, crypt_stat->key, key_rec->enc_key_size); + sg_init_one(&dst_sg, key_rec->enc_key, key_rec->enc_key_size); mutex_lock(tfm_mutex); rc = crypto_skcipher_setkey(tfm, session_key_encryption_key, crypt_stat->key_size); @@ -2296,7 +2232,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, rc = 0; ecryptfs_printk(KERN_DEBUG, "Encrypting [%zd] bytes of the key\n", crypt_stat->key_size); - skcipher_request_set_crypt(req, src_sg, dst_sg, + skcipher_request_set_crypt(req, &src_sg, &dst_sg, (*key_rec).enc_key_size, NULL); rc = crypto_skcipher_encrypt(req); mutex_unlock(tfm_mutex); -- 2.39.5