diff options
-rw-r--r-- | fs/ecryptfs/miscdev.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 09a4522f65e6..b484792a0996 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
@@ -358,46 +358,6 @@ out_unlock_daemon: | |||
358 | } | 358 | } |
359 | 359 | ||
360 | /** | 360 | /** |
361 | * ecryptfs_miscdev_helo | ||
362 | * @euid: effective user id of miscdevess sending helo packet | ||
363 | * @user_ns: The namespace in which @euid applies | ||
364 | * @pid: miscdevess id of miscdevess sending helo packet | ||
365 | * | ||
366 | * Returns zero on success; non-zero otherwise | ||
367 | */ | ||
368 | static int ecryptfs_miscdev_helo(uid_t euid, struct user_namespace *user_ns, | ||
369 | struct pid *pid) | ||
370 | { | ||
371 | int rc; | ||
372 | |||
373 | rc = ecryptfs_process_helo(ECRYPTFS_TRANSPORT_MISCDEV, euid, user_ns, | ||
374 | pid); | ||
375 | if (rc) | ||
376 | printk(KERN_WARNING "Error processing HELO; rc = [%d]\n", rc); | ||
377 | return rc; | ||
378 | } | ||
379 | |||
380 | /** | ||
381 | * ecryptfs_miscdev_quit | ||
382 | * @euid: effective user id of miscdevess sending quit packet | ||
383 | * @user_ns: The namespace in which @euid applies | ||
384 | * @pid: miscdevess id of miscdevess sending quit packet | ||
385 | * | ||
386 | * Returns zero on success; non-zero otherwise | ||
387 | */ | ||
388 | static int ecryptfs_miscdev_quit(uid_t euid, struct user_namespace *user_ns, | ||
389 | struct pid *pid) | ||
390 | { | ||
391 | int rc; | ||
392 | |||
393 | rc = ecryptfs_process_quit(euid, user_ns, pid); | ||
394 | if (rc) | ||
395 | printk(KERN_WARNING | ||
396 | "Error processing QUIT message; rc = [%d]\n", rc); | ||
397 | return rc; | ||
398 | } | ||
399 | |||
400 | /** | ||
401 | * ecryptfs_miscdev_response - miscdevess response to message previously sent to daemon | 361 | * ecryptfs_miscdev_response - miscdevess response to message previously sent to daemon |
402 | * @data: Bytes comprising struct ecryptfs_message | 362 | * @data: Bytes comprising struct ecryptfs_message |
403 | * @data_size: sizeof(struct ecryptfs_message) + data len | 363 | * @data_size: sizeof(struct ecryptfs_message) + data len |
@@ -512,26 +472,7 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf, | |||
512 | __func__, rc); | 472 | __func__, rc); |
513 | break; | 473 | break; |
514 | case ECRYPTFS_MSG_HELO: | 474 | case ECRYPTFS_MSG_HELO: |
515 | rc = ecryptfs_miscdev_helo(current->euid, | ||
516 | current->nsproxy->user_ns, | ||
517 | task_pid(current)); | ||
518 | if (rc) { | ||
519 | printk(KERN_ERR "%s: Error attempting to process " | ||
520 | "helo from pid [0x%p]; rc = [%d]\n", __func__, | ||
521 | task_pid(current), rc); | ||
522 | goto out_free; | ||
523 | } | ||
524 | break; | ||
525 | case ECRYPTFS_MSG_QUIT: | 475 | case ECRYPTFS_MSG_QUIT: |
526 | rc = ecryptfs_miscdev_quit(current->euid, | ||
527 | current->nsproxy->user_ns, | ||
528 | task_pid(current)); | ||
529 | if (rc) { | ||
530 | printk(KERN_ERR "%s: Error attempting to process " | ||
531 | "quit from pid [0x%p]; rc = [%d]\n", __func__, | ||
532 | task_pid(current), rc); | ||
533 | goto out_free; | ||
534 | } | ||
535 | break; | 476 | break; |
536 | default: | 477 | default: |
537 | ecryptfs_printk(KERN_WARNING, "Dropping miscdev " | 478 | ecryptfs_printk(KERN_WARNING, "Dropping miscdev " |