- ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     ecryptfs: Use the passed-in max value as the upper bound.

has been removed from the -mm tree.  Its filename is

     ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch

This patch was dropped because it was folded into ecryptfs-fs-makefile-and-fs-kconfig.patch

------------------------------------------------------
Subject: ecryptfs: Use the passed-in max value as the upper bound.
From: Stephan Mueller <smueller@xxxxxxxxxx>


Function encrypted_session_key_set is given a maximum length it is allowed to
write.  This patch makes this function to obey this length.

Signed-off-by: Stephan Mueller <smueller@xxxxxxxxxx>
Acked-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 fs/ecryptfs/keystore.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/ecryptfs/keystore.c~ecryptfs-use-the-passed-in-max-value-as-the-upper-bound fs/ecryptfs/keystore.c
--- 25/fs/ecryptfs/keystore.c~ecryptfs-use-the-passed-in-max-value-as-the-upper-bound	Tue Jun 27 15:09:40 2006
+++ 25-akpm/fs/ecryptfs/keystore.c	Tue Jun 27 15:09:40 2006
@@ -928,7 +928,7 @@ encrypted_session_key_set:
 	/* TODO: Packet size limit */
 	/* We have 5 bytes of surrounding packet data */
 	if ((0x05 + ECRYPTFS_SALT_SIZE
-	     + (*key_rec).enc_key_size) >= PAGE_CACHE_SIZE) {
+	     + (*key_rec).enc_key_size) >= max) {
 		ecryptfs_printk(KERN_ERR, "Authentication token is too "
 				"large\n");
 		rc = -EINVAL;
_

Patches currently in -mm which might be from smueller@xxxxxxxxxx are

ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch
ecryptfs-change-the-maximum-size-check-when-writing-header.patch
ecryptfs-print-the-actual-option-that-is-problematic.patch
ecryptfs-partial-signed-integer-to-size_t-conversion-updated-ii.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux