lkml.org 
[lkml]   [2011]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] eCryptfs: fix compile error
    Date
    This patch fixes the compile error reported at the address:

    https://bugzilla.kernel.org/show_bug.cgi?id=40292

    The problem arises when compiling eCryptfs as built-in and the 'encrypted'
    key type as a module. The patch enables the 'encrypted' key type support
    for eCryptfs only when both components are compiled as built-in, both as
    modules or eCryptfs as a module and the 'encrypted' key type as built-in.

    Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
    Reported-by: David Hill <hilld@binarystorm.net>
    ---
    fs/ecryptfs/ecryptfs_kernel.h | 4 +++-
    1 files changed, 3 insertions(+), 1 deletions(-)

    diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
    index b36c557..a2da660 100644
    --- a/fs/ecryptfs/ecryptfs_kernel.h
    +++ b/fs/ecryptfs/ecryptfs_kernel.h
    @@ -79,7 +79,9 @@ struct ecryptfs_page_crypt_context {
    } param;
    };

    -#if defined(CONFIG_ENCRYPTED_KEYS) || defined(CONFIG_ENCRYPTED_KEYS_MODULE)
    +#if (defined(CONFIG_ECRYPT_FS) && defined(CONFIG_ENCRYPTED_KEYS)) || \
    + (defined(CONFIG_ECRYPT_FS_MODULE) && \
    + (defined(CONFIG_ENCRYPTED_KEYS) || defined(CONFIG_ENCRYPTED_KEYS_MODULE)))
    static inline struct ecryptfs_auth_tok *
    ecryptfs_get_encrypted_key_payload_data(struct key *key)
    {
    --
    1.7.6
    [unhandled content-type:application/x-pkcs7-signature]
    \
     
     \ /
      Last update: 2011-07-29 18:53    [W:0.021 / U:32.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site