lkml.org 
[lkml]   [2009]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] crypto: padlock-aes: Use the correct mask when checking whether copying is required
    crypto: padlock-aes: Use the correct mask when checking whether copying is required

    Masking with PAGE_SIZE is just wrong... and there's no need for the braces and return
    statement either.

    Signed-off-by: Chuck Ebbert <cebbert@redhat.com>

    ---
    Can we get this in 2.6.32 and -stable? It fixes a fatal oops in the driver.

    --- a/drivers/crypto/padlock-aes.c
    +++ b/drivers/crypto/padlock-aes.c
    @@ -236,19 +236,17 @@ static inline void ecb_crypt(const u8 *i
    /* Padlock in ECB mode fetches at least ecb_fetch_bytes of data.
    * We could avoid some copying here but it's probably not worth it.
    */
    - if (unlikely(((unsigned long)in & PAGE_SIZE) + ecb_fetch_bytes > PAGE_SIZE)) {
    + if (unlikely(((unsigned long)in & ~PAGE_MASK) + ecb_fetch_bytes > PAGE_SIZE))
    ecb_crypt_copy(in, out, key, cword, count);
    - return;
    - }
    -
    - rep_xcrypt_ecb(in, out, key, cword, count);
    + else
    + rep_xcrypt_ecb(in, out, key, cword, count);
    }

    static inline u8 *cbc_crypt(const u8 *in, u8 *out, u32 *key,
    u8 *iv, struct cword *cword, int count)
    {
    /* Padlock in CBC mode fetches at least cbc_fetch_bytes of data. */
    - if (unlikely(((unsigned long)in & PAGE_SIZE) + cbc_fetch_bytes > PAGE_SIZE))
    + if (unlikely(((unsigned long)in & ~PAGE_MASK) + cbc_fetch_bytes > PAGE_SIZE))
    return cbc_crypt_copy(in, out, key, iv, cword, count);

    return rep_xcrypt_cbc(in, out, key, iv, cword, count);

    \
     
     \ /
      Last update: 2009-10-28 00:29    [W:0.034 / U:0.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site