Skip to content
  1. Apr 20, 2010
    • Tyler Hicks's avatar
      eCryptfs: Turn lower lookup error messages into debug messages · 9f37622f
      Tyler Hicks authored
      
      
      Vaugue warnings about ENAMETOOLONG errors when looking up an encrypted
      file name have caused many users to become concerned about their data.
      Since this is a rather harmless condition, I'm moving this warning to
      only be printed when the ecryptfs_verbosity module param is 1.
      
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      9f37622f
    • Tyler Hicks's avatar
      eCryptfs: Copy lower directory inode times and size on link · 3a8380c0
      Tyler Hicks authored
      
      
      The timestamps and size of a lower inode involved in a link() call was
      being copied to the upper parent inode.  Instead, we should be
      copying lower parent inode's timestamps and size to the upper parent
      inode.  I discovered this bug using the POSIX test suite at Tuxera.
      
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      3a8380c0
    • Jeff Mahoney's avatar
      ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode · 133b8f9d
      Jeff Mahoney authored
      Since tmpfs has no persistent storage, it pins all its dentries in memory
      so they have d_count=1 when other file systems would have d_count=0.
      ->lookup is only used to create new dentries. If the caller doesn't
      instantiate it, it's freed immediately at dput(). ->readdir reads
      directly from the dcache and depends on the dentries being hashed.
      
      When an ecryptfs mount is mounted, it associates the lower file and dentry
      with the ecryptfs files as they're accessed. When it's umounted and
      destroys all the in-memory ecryptfs inodes, it fput's the lower_files and
      d_drop's the lower_dentries. Commit 4981e081 added this and a d_delete in
      2008 and several months later commit caeeeecf
      
       removed the d_delete. I
      believe the d_drop() needs to be removed as well.
      
      The d_drop effectively hides any file that has been accessed via ecryptfs
      from the underlying tmpfs since it depends on it being hashed for it to
      be accessible. I've removed the d_drop on my development node and see no
      ill effects with basic testing on both tmpfs and persistent storage.
      
      As a side effect, after ecryptfs d_drops the dentries on tmpfs, tmpfs
      BUGs on umount. This is due to the dentries being unhashed.
      tmpfs->kill_sb is kill_litter_super which calls d_genocide to drop
      the reference pinning the dentry. It skips unhashed and negative dentries,
      but shrink_dcache_for_umount_subtree doesn't. Since those dentries
      still have an elevated d_count, we get a BUG().
      
      This patch removes the d_drop call and fixes both issues.
      
      This issue was reported at:
      https://bugzilla.novell.com/show_bug.cgi?id=567887
      
      Reported-by: default avatarÁrpád Bíró <biroa@demasz.hu>
      Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
      Cc: Dustin Kirkland <kirkland@canonical.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      133b8f9d
    • Christian Pulvermacher's avatar
      ecryptfs: fix error code for missing xattrs in lower fs · cfce08c6
      Christian Pulvermacher authored
      
      
      If the lower file system driver has extended attributes disabled,
      ecryptfs' own access functions return -ENOSYS instead of -EOPNOTSUPP.
      This breaks execution of programs in the ecryptfs mount, since the
      kernel expects the latter error when checking for security
      capabilities in xattrs.
      
      Signed-off-by: default avatarChristian Pulvermacher <pulvermacher@gmx.de>
      Cc: stable@kernel.org
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      cfce08c6
    • Tyler Hicks's avatar
      eCryptfs: Decrypt symlink target for stat size · 3a60a168
      Tyler Hicks authored
      
      
      Create a getattr handler for eCryptfs symlinks that is capable of
      reading the lower target and decrypting its path.  Prior to this patch,
      a stat's st_size field would represent the strlen of the encrypted path,
      while readlink() would return the strlen of the decrypted path.  This
      could lead to confusion in some userspace applications, since the two
      values should be equal.
      
      https://bugs.launchpad.net/bugs/524919
      
      Reported-by: default avatarLoïc Minier <loic.minier@canonical.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      3a60a168
  2. Mar 24, 2010
  3. Mar 20, 2010
    • Linus Torvalds's avatar
      Linux 2.6.34-rc2 · 220bf991
      Linus Torvalds authored
      220bf991
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · e4d80637
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
        serial: sh-sci: remove duplicated #include
        sh: Export uncached helper symbols.
        sh: Fix up NUMA build for 29-bit.
        serial: sh-sci: Fix build failure for non-sh architectures.
        sh: Fix up uncached offset for legacy 29-bit mode.
        sh: Support CPU affinity masks for INTC controllers.
      e4d80637
    • Linus Torvalds's avatar
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · b50df7d1
      Linus Torvalds authored
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
        uwb: remove duplicate cpu_to_le16()
        uwb: declare MODULE_FIRMWARE() in i1480 DFU driver
        uwb: make USB device id table constant
        uwb: wlp: refactor wlp_get_<attribute>() macros
      b50df7d1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 · 352d4657
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
        alpha: fix compile errors in dma-mapping-common.h
        alpha: remove trailing spaces in messages
        alpha: use __ratelimit
      352d4657
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 95c46afe
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Remove IOMMU_VMERGE config option
        powerpc: Fix swiotlb to respect the boot option
        powerpc: Do not call prink when CONFIG_PRINTK is not defined
        powerpc: Use correct ccr bit for syscall error status
        powerpc/fsl-booke: Get coherent bit from PTE
        powerpc/85xx: Make sure lwarx hint isn't set on ppc32
      95c46afe
    • Linus Torvalds's avatar
      Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · cf3966bf
      Linus Torvalds authored
      * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        Delete zero-length file drivers/mtd/maps/omap_nor.c
      cf3966bf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 8dba8f94
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        tty_port,usb-console: Fix usb serial console open/close regression
        tty: cpm_uart: use resource_size()
        tty_buffer: Fix distinct type warning
        hvc_console: Fix race between hvc_close and hvc_remove
        uartlite: Fix build on sparc.
        tty: Take a 256 byte padding into account when buffering below sub-page units
        Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"
      8dba8f94
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · 2eb645e7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        driver core: numa: fix BUILD_BUG_ON for node_read_distance
        driver-core: document ERR_PTR() return values
        kobject: documentation: Update to refer to kset-example.c.
        sysdev: the cpu probe/release attributes should be sysdev_class_attributes
        kobject: documentation: Fix erroneous example in kobject doc.
        driver-core: fix missing kernel-doc in firmware_class
        Driver core: Early platform kernel-doc update
        sysfs: fix sysfs lockdep warning in mlx4 code
        sysfs: fix sysfs lockdep warning in infiniband code
        sysfs: fix sysfs lockdep warning in ipmi code
        sysfs: Initialised pci bus legacy_mem field before use
        sysfs: use sysfs_bin_attr_init in firmware class driver
      2eb645e7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 8fdb7e9f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (45 commits)
        USB: gadget/multi: cdc_do_config: remove redundant check
        usb: r8a66597-hcd: fix removed from an attached hub
        USB: xhci: Make endpoint interval debugging clearer.
        USB: Fix usb_fill_int_urb for SuperSpeed devices
        USB: cp210x: Remove double usb_control_msg from cp210x_set_config
        USB: Remove last bit of CONFIG_USB_BERRY_CHARGE
        USB: gadget: add gadget controller number for s3c-hsotg driver
        USB: ftdi_sio: Fix locking for change_speed() function
        USB: g_mass_storage: fixed module name in Kconfig
        USB: gadget: f_mass_storage::fsg_bind(): fix error handling
        USB: g_mass_storage: fix section mismatch warnings
        USB: gadget: fix Blackfin builds after gadget cleansing
        USB: goku_udc: remove potential null dereference
        USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff
        USB: serial: Fix module name typo for qcaux Kconfig entry.
        usb: cdc-wdm: Fix deadlock between write and resume
        usb: cdc-wdm: Fix order in disconnect and fix locking
        usb: cdc-wdm:Fix loss of data due to autosuspend
        usb: cdc-wdm: Fix submission of URB after suspension
        usb: cdc-wdm: Fix race between disconnect and debug messages
        ...
      8fdb7e9f
    • Jeff Garzik's avatar
      Delete zero-length file drivers/mtd/maps/omap_nor.c · 17cf4442
      Jeff Garzik authored
      The content was deleted in cc87edb1
      
      ,
      but the file remained as a zero-length file.
      
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      17cf4442
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · fc7f99cf
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits)
        ceph: update for write_inode API change
        ceph: reset osd after relevant messages timed out
        ceph: fix flush_dirty_caps race with caps migration
        ceph: include migrating caps in issued set
        ceph: fix osdmap decoding when pools include (removed) snaps
        ceph: return EBADF if waiting for caps on closed file
        ceph: set osd request message front length correctly
        ceph: reset front len on return to msgpool; BUG on mismatched front iov
        ceph: fix snaptrace decoding on cap migration between mds
        ceph: use single osd op reply msg
        ceph: reset bits on connection close
        ceph: remove bogus mds forward warning
        ceph: remove fragile __map_osds optimization
        ceph: fix connection fault STANDBY check
        ceph: invalidate_authorizer without con->mutex held
        ceph: don't clobber write return value when using O_SYNC
        ceph: fix client_request_forward decoding
        ceph: drop messages on unregistered mds sessions; cleanup
        ceph: fix comments, locking in destroy_inode
        ceph: move dereference after NULL test
        ...
      
      Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt
      fc7f99cf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 0a492fde
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: trivial white space
        [CIFS] checkpatch cleanup
        cifs: add cifs_revalidate_file
        cifs: add a CIFSSMBUnixQFileInfo function
        cifs: add a CIFSSMBQFileInfo function
        cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry
      0a492fde
  4. Mar 19, 2010