Patched in Tegra support.

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 2333203a120..ac1ad48c237 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -109,7 +109,7 @@ int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,
                 (*size) += ((unsigned char)(data[1]) + 192);
                 (*length_size) = 2;
         } else if (data[0] == 255) {
-                /* If support is added, adjust ECRYPTFS_MAX_PKT_LEN_SIZE */
+                /* Five-byte length; we're not supposed to see this */
                 ecryptfs_printk(KERN_ERR, "Five-byte packet length not "
                                 "supported\n");
                 rc = -EINVAL;
@@ -126,7 +126,7 @@ out:
 /**
  * ecryptfs_write_packet_length
  * @dest: The byte array target into which to write the length. Must
- *        have at least ECRYPTFS_MAX_PKT_LEN_SIZE bytes allocated.
+ *        have at least 5 bytes allocated.
  * @size: The length to write.
  * @packet_size_length: The number of bytes used to encode the packet
  *                      length is written to this address.
@@ -146,7 +146,6 @@ int ecryptfs_write_packet_length(char *dest, size_t size,
                 dest[1] = ((size - 192) % 256);
                 (*packet_size_length) = 2;
         } else {
-                /* If support is added, adjust ECRYPTFS_MAX_PKT_LEN_SIZE */
                 rc = -EINVAL;
                 ecryptfs_printk(KERN_WARNING,
                                 "Unsupported packet size: [%zd]\n", size);
@@ -679,7 +678,10 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
          * Octets N3-N4: Block-aligned encrypted filename
          *  - Consists of a minimum number of random characters, a \0
          *    separator, and then the filename */
-        s->max_packet_size = (ECRYPTFS_TAG_70_MAX_METADATA_SIZE
+        s->max_packet_size = (1                   /* Tag 70 identifier */
+                              + 3                 /* Max Tag 70 packet size */
+                              + ECRYPTFS_SIG_SIZE /* FNEK sig */
+                              + 1                 /* Cipher identifier */
                               + s->block_aligned_filename_size);
         if (dest == NULL) {
                 (*packet_size) = s->max_packet_size;
@@ -931,10 +933,10 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                 goto out;
         }
         s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
-        if (max_packet_size < ECRYPTFS_TAG_70_MIN_METADATA_SIZE) {
+        if (max_packet_size < (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)) {
                 printk(KERN_WARNING "%s: max_packet_size is [%zd]; it must be "
                        "at least [%d]\n", __func__, max_packet_size,
-                       ECRYPTFS_TAG_70_MIN_METADATA_SIZE);
+                        (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1));
                 rc = -EINVAL;
                 goto out;
         }