1 files changed, 24 insertions, 14 deletions

diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 405ebc3932c2..3264dcfdc92a 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -32,7 +32,7 @@ static struct fscache_object *cachefiles_alloc_object(
         struct cachefiles_cache *cache;
         struct cachefiles_xattr *auxdata;
         unsigned keylen, auxlen;
-        void *buffer;
+        void *buffer, *p;
         char *key;
 
         cache = container_of(_cache, struct cachefiles_cache, cache);
@@ -65,8 +65,12 @@ static struct fscache_object *cachefiles_alloc_object(
         if (!buffer)
                 goto nomem_buffer;
 
-        keylen = cookie->def->get_key(cookie->netfs_data, buffer + 2, 512);
-        ASSERTCMP(keylen, <, 512);
+        keylen = cookie->key_len;
+        if (keylen <= sizeof(cookie->inline_key))
+                p = cookie->inline_key;
+        else
+                p = cookie->key;
+        memcpy(buffer + 2, p, keylen);
 
         *(uint16_t *)buffer = keylen;
         ((char *)buffer)[keylen + 2] = 0;
@@ -80,15 +84,17 @@ static struct fscache_object *cachefiles_alloc_object(
 
         /* get hold of the auxiliary data and prepend the object type */
         auxdata = buffer;
-        auxlen = 0;
-        if (cookie->def->get_aux) {
-                auxlen = cookie->def->get_aux(cookie->netfs_data,
-                                              auxdata->data, 511);
-                ASSERTCMP(auxlen, <, 511);
+        auxlen = cookie->aux_len;
+        if (auxlen) {
+                if (auxlen <= sizeof(cookie->inline_aux))
+                        p = cookie->inline_aux;
+                else
+                        p = cookie->aux;
+                memcpy(auxdata->data, p, auxlen);
         }
 
         auxdata->len = auxlen + 1;
-        auxdata->type = cookie->def->type;
+        auxdata->type = cookie->type;
 
         lookup_data->auxdata = auxdata;
         lookup_data->key = key;
@@ -206,6 +212,7 @@ static void cachefiles_update_object(struct fscache_object *_object)
         struct cachefiles_cache *cache;
         struct fscache_cookie *cookie;
         const struct cred *saved_cred;
+        const void *aux;
         unsigned auxlen;
 
         _enter("{OBJ%x}", _object->debug_id);
@@ -220,26 +227,29 @@ static void cachefiles_update_object(struct fscache_object *_object)
         }
 
         cookie = object->fscache.cookie;
+        auxlen = cookie->aux_len;
 
-        if (!cookie->def->get_aux) {
+        if (!auxlen) {
                 fscache_unuse_cookie(_object);
                 _leave(" [no aux]");
                 return;
         }
 
-        auxdata = kmalloc(2 + 512 + 3, cachefiles_gfp);
+        auxdata = kmalloc(2 + auxlen + 3, cachefiles_gfp);
         if (!auxdata) {
                 fscache_unuse_cookie(_object);
                 _leave(" [nomem]");
                 return;
         }
 
-        auxlen = cookie->def->get_aux(cookie->netfs_data, auxdata->data, 511);
+        aux = (auxlen <= sizeof(cookie->inline_aux)) ?
+                cookie->inline_aux : cookie->aux;
+
+        memcpy(auxdata->data, aux, auxlen);
         fscache_unuse_cookie(_object);
-        ASSERTCMP(auxlen, <, 511);
 
         auxdata->len = auxlen + 1;
-        auxdata->type = cookie->def->type;
+        auxdata->type = cookie->type;
 
         cachefiles_begin_secure(cache, &saved_cred);
         cachefiles_update_object_xattr(object, auxdata);