lkml.org 
[lkml]   [2021]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 48/69] Revert "ecryptfs: replace BUG_ON with error handling code"
    Date
    This reverts commit 2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72.

    Because of recent interactions with developers from @umn.edu, all
    commits from them have been recently re-reviewed to ensure if they were
    correct or not.

    Upon review, this commit was found to be incorrect for the reasons
    below, so it must be reverted. It will be fixed up "correctly" in a
    later kernel change.

    The original commit log for this change was incorrect, no "error
    handling code" was added, things will blow up just as badly as before if
    any of these cases ever were true. As this BUG_ON() never fired, and
    most of these checks are "obviously" never going to be true, let's just
    revert to the original code for now until this gets unwound to be done
    correctly in the future.

    Cc: Aditya Pakki <pakki001@umn.edu>
    Fixes: 2c2a7552dd64 ("ecryptfs: replace BUG_ON with error handling code")
    Cc: stable <stable@vger.kernel.org>
    Acked-by: Tyler Hicks <code@tyhicks.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ecryptfs/crypto.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
    index 943e523f4c9d..3d8623139538 100644
    --- a/fs/ecryptfs/crypto.c
    +++ b/fs/ecryptfs/crypto.c
    @@ -296,10 +296,8 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
    struct extent_crypt_result ecr;
    int rc = 0;

    - if (!crypt_stat || !crypt_stat->tfm
    - || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED))
    - return -EINVAL;
    -
    + BUG_ON(!crypt_stat || !crypt_stat->tfm
    + || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED));
    if (unlikely(ecryptfs_verbosity > 0)) {
    ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n",
    crypt_stat->key_size);
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-05-03 14:02    [W:3.639 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site