adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

ecryptfs: discard ecryptfsd registration messages in miscdev

Browse source 
The userspace eCryptfs daemon sends HELO and QUIT messages to the kernel
for per-user daemon (un)registration.  These messages are required when
netlink is used as the transport, but (un)registration is handled by
opening and closing the device file when miscdev is the transport.  These
messages should be discarded in the miscdev transport so that a daemon
isn't registered twice.

Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tyler Hicks 2008-07-23 21:30:04 -07:00 committed by Linus Torvalds
parent 746f1e558b
commit 6c4c17b073
1 changed files with 0 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
fs/ecryptfs/miscdev.c
View file

@ -357,46 +357,6 @@ out_unlock_daemon:
return rc;
}
/**
* ecryptfs_miscdev_helo
* @euid: effective user id of miscdevess sending helo packet
* @user_ns: The namespace in which @euid applies
* @pid: miscdevess id of miscdevess sending helo packet
*
* Returns zero on success; non-zero otherwise
*/
static int ecryptfs_miscdev_helo(uid_t euid, struct user_namespace *user_ns,
struct pid *pid)
{
int rc;
rc = ecryptfs_process_helo(ECRYPTFS_TRANSPORT_MISCDEV, euid, user_ns,
pid);
if (rc)
printk(KERN_WARNING "Error processing HELO; rc = [%d]\n", rc);
return rc;
}
/**
* ecryptfs_miscdev_quit
* @euid: effective user id of miscdevess sending quit packet
* @user_ns: The namespace in which @euid applies
* @pid: miscdevess id of miscdevess sending quit packet
*
* Returns zero on success; non-zero otherwise
*/
static int ecryptfs_miscdev_quit(uid_t euid, struct user_namespace *user_ns,
struct pid *pid)
{
int rc;
rc = ecryptfs_process_quit(euid, user_ns, pid);
if (rc)
printk(KERN_WARNING
"Error processing QUIT message; rc = [%d]\n", rc);
return rc;
}
/**
* ecryptfs_miscdev_response - miscdevess response to message previously sent to daemon
* @data: Bytes comprising struct ecryptfs_message
@ -512,26 +472,7 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf,
__func__, rc);
break;
case ECRYPTFS_MSG_HELO:
rc = ecryptfs_miscdev_helo(current->euid,
current->nsproxy->user_ns,
task_pid(current));
if (rc) {
printk(KERN_ERR "%s: Error attempting to process "
"helo from pid [0x%p]; rc = [%d]\n", __func__,
task_pid(current), rc);
goto out_free;
}
break;
case ECRYPTFS_MSG_QUIT:
rc = ecryptfs_miscdev_quit(current->euid,
current->nsproxy->user_ns,
task_pid(current));
if (rc) {
printk(KERN_ERR "%s: Error attempting to process "
"quit from pid [0x%p]; rc = [%d]\n", __func__,
task_pid(current), rc);
goto out_free;
}
break;
default:
ecryptfs_printk(KERN_WARNING, "Dropping miscdev "