6307f8fee2
security: remove dead hook task_setgroups
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:19:18 +10:00
06ad187e28
security: remove dead hook task_setgid
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:19:17 +10:00
43ed8c3b45
security: remove dead hook task_setuid
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:19:16 +10:00
0968d0060a
security: remove dead hook cred_commit
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:19:15 +10:00
9d5ed77dad
security: remove dead hook inode_delete
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:19:15 +10:00
91a9420f58
security: remove dead hook sb_post_pivotroot
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:32 +10:00
3db2910177
security: remove dead hook sb_post_addmount
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:31 +10:00
82dab10453
security: remove dead hook sb_post_remount
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:30 +10:00
4b61d12c84
security: remove dead hook sb_umount_busy
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:30 +10:00
231923bd0e
security: remove dead hook sb_umount_close
...
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:29 +10:00
353633100d
security: remove sb_check_sb hooks
...
Unused hook. Remove it.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-12 12:18:28 +10:00
c1a7368a6f
Security: Fix coding style in security/
...
Fix coding style in security/
Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-09 15:13:48 +10:00
e2902eb79f
SMACK: remove dead cred_commit hook
...
This is an unused hook in SMACK so remove it.
Signed-off-by: Eric Paris <eparis@redhat.com >
Acked-by: Casey Schaufler <casey@schaufler-ca.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-08 09:20:21 +10:00
dd3e7836bf
selinux: always call sk_security_struct sksec
...
trying to grep everything that messes with a sk_security_struct isn't easy
since we don't always call it sksec. Just rename everything sksec.
Signed-off-by: Eric Paris <eparis@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-04-08 09:17:02 +10:00
d25d6fa1a9
Merge branch 'master' into next
2010-03-31 08:39:27 +11:00
2eaa9cfdf3
Linux 2.6.34-rc3
2010-03-30 09:24:39 -07:00
e971461fc5
KEYS: Add MAINTAINERS record
...
Add a MAINTAINERS record for the key management facility.
Signed-off-by: David Howells <dhowells@redhat.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-30 09:24:28 -07:00
246750ffa1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
CRED: Fix memory leak in error handling
2010-03-30 07:26:30 -07:00
4660d3d240
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
...
* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
[LogFS] Erase new journal segments
[LogFS] Move reserved segments with journal
[LogFS] Clear PagePrivate when moving journal
Simplify and fix pad_wbuf
Prevent data corruption in logfs_rewrite_block()
Use deactivate_locked_super
Fix logfs_get_sb_final error path
Write out both superblocks on mismatch
Prevent schedule while atomic in __logfs_readdir
Plug memory leak in writeseg_end_io
Limit max_pages for insane devices
Open segment file before using it
2010-03-30 07:24:55 -07:00
be3fd3cc7c
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Do not free zero sized per cpu areas
x86: Make sure free_init_pages() frees pages on page boundary
x86: Make smp_locks end with page alignment
2010-03-30 07:22:38 -07:00
570b8fb505
CRED: Fix memory leak in error handling
...
Fix a memory leak on an OOM condition in prepare_usermodehelper_creds().
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com >
Signed-off-by: David Howells <dhowells@redhat.com >
Signed-off-by: James Morris <jmorris@namei.org >
2010-03-30 17:15:38 +11:00
9623e5a237
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
...
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Fix a race in o2dlm lockres mastery
Ocfs2: Handle deletion of reflinked oprhan inodes correctly.
Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir.
ocfs2: Clear undo bits when local alloc is freed
ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
ocfs2: Fix the update of name_offset when removing xattrs
ocfs2: Always try for maximum bits with new local alloc windows
ocfs2: set i_mode on disk during acl operations
ocfs2: Update i_blocks in reflink operations.
ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
[PATCH] Skip check for mandatory locks when unlocking
2010-03-29 14:42:39 -07:00
9f32160372
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
ceph: update discussion list address in MAINTAINERS
ceph: some documentations fixes
ceph: fix use after free on mds __unregister_request
ceph: avoid loaded term 'OSD' in documention
ceph: fix possible double-free of mds request reference
ceph: fix session check on mds reply
ceph: handle kmalloc() failure
ceph: propagate mds session allocation failures to caller
ceph: make write_begin wait propagate ERESTARTSYS
ceph: fix snap rebuild condition
ceph: avoid reopening osd connections when address hasn't changed
ceph: rename r_sent_stamp r_stamp
ceph: fix connection fault con_work reentrancy problem
ceph: prevent dup stale messages to console for restarting mds
ceph: fix pg pool decoding from incremental osdmap update
ceph: fix mds sync() race with completing requests
ceph: only release unused caps with mds requests
ceph: clean up handle_cap_grant, handle_caps wrt session mutex
ceph: fix session locking in handle_caps, ceph_check_caps
ceph: drop unnecessary WARN_ON in caps migration
...
2010-03-29 14:42:25 -07:00
9d54e2c0b0
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
...
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (asc7621) Add X58 entry in Kconfig
hwmon: (w83793) Saving negative errors in unsigned
hwmon: (coretemp) Add missing newline to dev_warn() message
hwmon: (coretemp) Fix cpu model output
2010-03-29 14:42:08 -07:00
7b12887244
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
...
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_via: fix VT6410/6415/6330 detection issue
2010-03-29 14:41:48 -07:00
Eric Paris
wzt.wzt@gmail.com
James Morris
Linus Torvalds
David Howells
Mathieu Desnoyers