1. 21 5月, 2018 1 次提交
  2. 12 1月, 2018 9 次提交
    • E
      fscrypt: remove 'ci' parameter from fscrypt_put_encryption_info() · 3d204e24
      Eric Biggers 提交于
      fscrypt_put_encryption_info() is only called when evicting an inode, so
      the 'struct fscrypt_info *ci' parameter is always NULL, and there cannot
      be races with other threads.  This was cruft left over from the broken
      key revocation code.  Remove the unused parameter and the cmpxchg().
      
      Also remove the #ifdefs around the fscrypt_put_encryption_info() calls,
      since fscrypt_notsupp.h defines a no-op stub for it.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      3d204e24
    • E
      fscrypt: fix up fscrypt_fname_encrypted_size() for internal use · b9db0b4a
      Eric Biggers 提交于
      Filesystems don't need fscrypt_fname_encrypted_size() anymore, so
      unexport it and move it to fscrypt_private.h.
      
      We also never calculate the encrypted size of a filename without having
      the fscrypt_info present since it is needed to know the amount of
      NUL-padding which is determined by the encryption policy, and also we
      will always truncate the NUL-padding to the maximum filename length.
      Therefore, also make fscrypt_fname_encrypted_size() assume that the
      fscrypt_info is present, and make it truncate the returned length to the
      specified max_len.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      b9db0b4a
    • E
      fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names · 2cbadadc
      Eric Biggers 提交于
      Previously fscrypt_fname_alloc_buffer() was used to allocate buffers for
      both presented (decrypted or encoded) and encrypted filenames.  That was
      confusing, because it had to allocate the worst-case size for either,
      e.g. including NUL-padding even when it was meaningless.
      
      But now that fscrypt_setup_filename() no longer calls it, it is only
      used in the ->get_link() and ->readdir() paths, which specifically want
      a buffer for presented filenames.  Therefore, switch the behavior over
      to allocating the buffer for presented filenames only.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      2cbadadc
    • E
      fscrypt: remove fscrypt_fname_usr_to_disk() · 1e80ad71
      Eric Biggers 提交于
      fscrypt_fname_usr_to_disk() sounded very generic but was actually only
      used to encrypt symlinks.  Remove it now that all filesystems have been
      switched over to fscrypt_encrypt_symlink().
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      1e80ad71
    • E
      fscrypt: new helper function - fscrypt_get_symlink() · 3b0d8837
      Eric Biggers 提交于
      Filesystems also have duplicate code to support ->get_link() on
      encrypted symlinks.  Factor it out into a new function
      fscrypt_get_symlink().  It takes in the contents of the encrypted
      symlink on-disk and provides the target (decrypted or encoded) that
      should be returned from ->get_link().
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      3b0d8837
    • E
      fscrypt: new helper functions for ->symlink() · 76e81d6d
      Eric Biggers 提交于
      Currently, filesystems supporting fscrypt need to implement some tricky
      logic when creating encrypted symlinks, including handling a peculiar
      on-disk format (struct fscrypt_symlink_data) and correctly calculating
      the size of the encrypted symlink.  Introduce helper functions to make
      things a bit easier:
      
      - fscrypt_prepare_symlink() computes and validates the size the symlink
        target will require on-disk.
      - fscrypt_encrypt_symlink() creates the encrypted target if needed.
      
      The new helpers actually fix some subtle bugs.  First, when checking
      whether the symlink target was too long, filesystems didn't account for
      the fact that the NUL padding is meant to be truncated if it would cause
      the maximum length to be exceeded, as is done for filenames in
      directories.  Consequently users would receive ENAMETOOLONG when
      creating symlinks close to what is supposed to be the maximum length.
      For example, with EXT4 with a 4K block size, the maximum symlink target
      length in an encrypted directory is supposed to be 4093 bytes (in
      comparison to 4095 in an unencrypted directory), but in
      FS_POLICY_FLAGS_PAD_32-mode only up to 4064 bytes were accepted.
      
      Second, symlink targets of "." and ".." were not being encrypted, even
      though they should be, as these names are special in *directory entries*
      but not in symlink targets.  Fortunately, we can fix this simply by
      starting to encrypt them, as old kernels already accept them in
      encrypted form.
      
      Third, the output string length the filesystems were providing when
      doing the actual encryption was incorrect, as it was forgotten to
      exclude 'sizeof(struct fscrypt_symlink_data)'.  Fortunately though, this
      bug didn't make a difference.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      76e81d6d
    • E
      fscrypt: split fscrypt_dummy_context_enabled() into supp/notsupp versions · 1493651b
      Eric Biggers 提交于
      fscrypt_dummy_context_enabled() accesses ->s_cop, which now is only set
      when the filesystem is built with encryption support.  This didn't
      actually matter because no filesystems called it.  However, it will
      start being used soon, so fix it by moving it from fscrypt.h to
      fscrypt_supp.h and stubbing it out in fscrypt_notsupp.h.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      1493651b
    • E
      fscrypt: move fscrypt_control_page() to supp/notsupp headers · 4fd4b15c
      Eric Biggers 提交于
      fscrypt_control_page() is already split into two versions depending on
      whether the filesystem is being built with encryption support or not.
      Move them into the appropriate headers.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      4fd4b15c
    • E
      fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers · 3d463f28
      Eric Biggers 提交于
      fscrypt_has_encryption_key() is already split into two versions
      depending on whether the filesystem is being built with encryption
      support or not.  Move them into the appropriate headers.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      3d463f28
  3. 02 11月, 2017 1 次提交
    • G
      License cleanup: add SPDX GPL-2.0 license identifier to files with no license · b2441318
      Greg Kroah-Hartman 提交于
      Many source files in the tree are missing licensing information, which
      makes it harder for compliance tools to determine the correct license.
      
      By default all files without license information are under the default
      license of the kernel, which is GPL version 2.
      
      Update the files which contain no license information with the 'GPL-2.0'
      SPDX license identifier.  The SPDX identifier is a legally binding
      shorthand, which can be used instead of the full boiler plate text.
      
      This patch is based on work done by Thomas Gleixner and Kate Stewart and
      Philippe Ombredanne.
      
      How this work was done:
      
      Patches were generated and checked against linux-4.14-rc6 for a subset of
      the use cases:
       - file had no licensing information it it.
       - file was a */uapi/* one with no licensing information in it,
       - file was a */uapi/* one with existing licensing information,
      
      Further patches will be generated in subsequent months to fix up cases
      where non-standard license headers were used, and references to license
      had to be inferred by heuristics based on keywords.
      
      The analysis to determine which SPDX License Identifier to be applied to
      a file was done in a spreadsheet of side by side results from of the
      output of two independent scanners (ScanCode & Windriver) producing SPDX
      tag:value files created by Philippe Ombredanne.  Philippe prepared the
      base worksheet, and did an initial spot review of a few 1000 files.
      
      The 4.13 kernel was the starting point of the analysis with 60,537 files
      assessed.  Kate Stewart did a file by file comparison of the scanner
      results in the spreadsheet to determine which SPDX license identifier(s)
      to be applied to the file. She confirmed any determination that was not
      immediately clear with lawyers working with the Linux Foundation.
      
      Criteria used to select files for SPDX license identifier tagging was:
       - Files considered eligible had to be source code files.
       - Make and config files were included as candidates if they contained >5
         lines of source
       - File already had some variant of a license header in it (even if <5
         lines).
      
      All documentation files were explicitly excluded.
      
      The following heuristics were used to determine which SPDX license
      identifiers to apply.
      
       - when both scanners couldn't find any license traces, file was
         considered to have no license information in it, and the top level
         COPYING file license applied.
      
         For non */uapi/* files that summary was:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|-------
         GPL-2.0                                              11139
      
         and resulted in the first patch in this series.
      
         If that file was a */uapi/* path one, it was "GPL-2.0 WITH
         Linux-syscall-note" otherwise it was "GPL-2.0".  Results of that was:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|-------
         GPL-2.0 WITH Linux-syscall-note                        930
      
         and resulted in the second patch in this series.
      
       - if a file had some form of licensing information in it, and was one
         of the */uapi/* ones, it was denoted with the Linux-syscall-note if
         any GPL family license was found in the file or had no licensing in
         it (per prior point).  Results summary:
      
         SPDX license identifier                            # files
         ---------------------------------------------------|------
         GPL-2.0 WITH Linux-syscall-note                       270
         GPL-2.0+ WITH Linux-syscall-note                      169
         ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause)    21
         ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)    17
         LGPL-2.1+ WITH Linux-syscall-note                      15
         GPL-1.0+ WITH Linux-syscall-note                       14
         ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause)    5
         LGPL-2.0+ WITH Linux-syscall-note                       4
         LGPL-2.1 WITH Linux-syscall-note                        3
         ((GPL-2.0 WITH Linux-syscall-note) OR MIT)              3
         ((GPL-2.0 WITH Linux-syscall-note) AND MIT)             1
      
         and that resulted in the third patch in this series.
      
       - when the two scanners agreed on the detected license(s), that became
         the concluded license(s).
      
       - when there was disagreement between the two scanners (one detected a
         license but the other didn't, or they both detected different
         licenses) a manual inspection of the file occurred.
      
       - In most cases a manual inspection of the information in the file
         resulted in a clear resolution of the license that should apply (and
         which scanner probably needed to revisit its heuristics).
      
       - When it was not immediately clear, the license identifier was
         confirmed with lawyers working with the Linux Foundation.
      
       - If there was any question as to the appropriate license identifier,
         the file was flagged for further research and to be revisited later
         in time.
      
      In total, over 70 hours of logged manual review was done on the
      spreadsheet to determine the SPDX license identifiers to apply to the
      source files by Kate, Philippe, Thomas and, in some cases, confirmation
      by lawyers working with the Linux Foundation.
      
      Kate also obtained a third independent scan of the 4.13 code base from
      FOSSology, and compared selected files where the other two scanners
      disagreed against that SPDX file, to see if there was new insights.  The
      Windriver scanner is based on an older version of FOSSology in part, so
      they are related.
      
      Thomas did random spot checks in about 500 files from the spreadsheets
      for the uapi headers and agreed with SPDX license identifier in the
      files he inspected. For the non-uapi files Thomas did random spot checks
      in about 15000 files.
      
      In initial set of patches against 4.14-rc6, 3 files were found to have
      copy/paste license identifier errors, and have been fixed to reflect the
      correct identifier.
      
      Additionally Philippe spent 10 hours this week doing a detailed manual
      inspection and review of the 12,461 patched files from the initial patch
      version early this week with:
       - a full scancode scan run, collecting the matched texts, detected
         license ids and scores
       - reviewing anything where there was a license detected (about 500+
         files) to ensure that the applied SPDX license was correct
       - reviewing anything where there was no detection but the patch license
         was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
         SPDX license was correct
      
      This produced a worksheet with 20 files needing minor correction.  This
      worksheet was then exported into 3 different .csv files for the
      different types of files to be modified.
      
      These .csv files were then reviewed by Greg.  Thomas wrote a script to
      parse the csv files and add the proper SPDX tag to the file, in the
      format that the file expected.  This script was further refined by Greg
      based on the output to detect more types of files automatically and to
      distinguish between header and source .c files (which need different
      comment types.)  Finally Greg ran the script using the .csv files to
      generate the patches.
      Reviewed-by: NKate Stewart <kstewart@linuxfoundation.org>
      Reviewed-by: NPhilippe Ombredanne <pombredanne@nexb.com>
      Reviewed-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b2441318
  4. 19 10月, 2017 6 次提交
  5. 04 5月, 2017 1 次提交
  6. 07 2月, 2017 1 次提交
    • E
      fscrypt: split supp and notsupp declarations into their own headers · 46f47e48
      Eric Biggers 提交于
      Previously, each filesystem configured without encryption support would
      define all the public fscrypt functions to their notsupp_* stubs.  This
      list of #defines had to be updated in every filesystem whenever a change
      was made to the public fscrypt functions.  To make things more
      maintainable now that we have three filesystems using fscrypt, split the
      old header fscrypto.h into several new headers.  fscrypt_supp.h contains
      the real declarations and is included by filesystems when configured
      with encryption support, whereas fscrypt_notsupp.h contains the inline
      stubs and is included by filesystems when configured without encryption
      support.  fscrypt_common.h contains common declarations needed by both.
      Signed-off-by: NEric Biggers <ebiggers@google.com>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      46f47e48