X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=security%2Ftomoyo%2Fcommon.c;h=ef43995119a453401dd768adfa5ae41a2602dd3a;hb=e6f6a4cc955d626ed26562d98de5766bf1f73526;hp=65c18af3ffe5eee9db53821fb93526dc815e9965;hpb=e2bf69077acefee5247bb661faac2552d29ba7ba;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 65c18af..ef43995 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1747,7 +1747,7 @@ static int tomoyo_write_answer(struct tomoyo_io_buffer *head)
 static void tomoyo_read_version(struct tomoyo_io_buffer *head)
 {
 	if (!head->r.eof) {
-		tomoyo_io_printf(head, "2.3.0-pre");
+		tomoyo_io_printf(head, "2.3.0");
 		head->r.eof = true;
 	}
 }
@@ -1898,6 +1898,23 @@ int tomoyo_open_control(const u8 type, struct file *file)
 }
 
 /**
+ * tomoyo_poll_control - poll() for /sys/kernel/security/tomoyo/ interface.
+ *
+ * @file: Pointer to "struct file".
+ * @wait: Pointer to "poll_table".
+ *
+ * Waits for read readiness.
+ * /sys/kernel/security/tomoyo/query is handled by /usr/sbin/tomoyo-queryd .
+ */
+int tomoyo_poll_control(struct file *file, poll_table *wait)
+{
+	struct tomoyo_io_buffer *head = file->private_data;
+	if (!head->poll)
+		return -ENOSYS;
+	return head->poll(file, wait);
+}
+
+/**
  * tomoyo_read_control - read() for /sys/kernel/security/tomoyo/ interface.
  *
  * @file:       Pointer to "struct file".
@@ -2037,6 +2054,6 @@ void tomoyo_check_profile(void)
 	if (tomoyo_profile_version != 20090903)
 		panic("Profile version %u is not supported.\n",
 		      tomoyo_profile_version);
-	printk(KERN_INFO "TOMOYO: 2.3.0-pre   2010/06/03\n");
+	printk(KERN_INFO "TOMOYO: 2.3.0\n");
 	printk(KERN_INFO "Mandatory Access Control activated.\n");
 }