Merge branch 'bugfixes' into nlattr

Conflicts:
	cryptodev_main.c
	examples/ncr.c
	examples/pk.c
	ncr-int.h
	ncr-key-wrap.c
	ncr-key.c
	ncr.c
	ncr.h

1 files changed, 2 insertions, 2 deletions

diff --git a/ncr.c b/ncr.c
index 8d7c008..55b40ef 100644
--- a/ncr.c
+++ b/ncr.c
@@ -80,7 +80,7 @@ void ncr_master_key_reset(void)
 static int ncr_master_key_set(const struct ncr_master_key_set *st,
 			      struct nlattr *tb[])
 {
-	if (current_euid() != 0 && !capable(CAP_SYS_ADMIN)) {
+	if (!capable(CAP_SYS_ADMIN)) {
 		err();
 		return -EPERM;
 	}
@@ -113,7 +113,7 @@ static int ncr_master_key_set(const struct ncr_master_key_set *st,
 	return 0;
 }
 
-int
+long
 ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg_)
 {
 	void __user *arg = (void __user *)arg_;