All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <455c26d7bbbeeee26cba2e0338f6fd927b0bd448.1505960744.git.baolin.wang@linaro.org>

diff --git a/a/1.txt b/N1/1.txt
index 5873603..ffd0252 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -229,7 +229,7 @@ index 83da68d..291a67c 100644
 -	now = current_kernel_time();
 -	time = now.tv_sec;
 +	time = ktime_get_real_seconds();
- 	if (key->revoked_at = 0 || key->revoked_at > time) {
+ 	if (key->revoked_at == 0 || key->revoked_at > time) {
  		key->revoked_at = time;
  		key_schedule_gc(key->revoked_at + key_gc_delay);
 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
@@ -343,7 +343,7 @@ index bf08d02..95c8720 100644
  	rcu_read_lock();
  
  	/* come up with a suitable timeout value */
- 	if (key->expiry = 0) {
+ 	if (key->expiry == 0) {
  		memcpy(xbuf, "perm", 5);
 -	} else if (now.tv_sec >= key->expiry) {
 +	} else if (now >= key->expiry) {
diff --git a/a/content_digest b/N1/content_digest
index 958796f..7cd8e81 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,20 @@
   "Subject\0[PATCH v2 1/2] security: keys: Replace time_t/timespec with time64_t\0"
 ]
 [
-  "Date\0Thu, 21 Sep 2017 02:32:02 +0000\0"
+  "Date\0Thu, 21 Sep 2017 10:32:02 +0800\0"
 ]
 [
-  "To\0linux-security-module\@vger.kernel.org\0"
+  "To\0dhowells\@redhat.com\0"
+]
+[
+  "Cc\0james.l.morris\@oracle.com",
+  " serge\@hallyn.com",
+  " arnd\@arndb.de",
+  " broonie\@kernel.org",
+  " keyrings\@vger.kernel.org",
+  " linux-kernel\@vger.kernel.org",
+  " linux-security-module\@vger.kernel.org",
+  " baolin.wang\@linaro.org\0"
 ]
 [
   "\0000:1\0"
@@ -251,7 +261,7 @@
   "-\tnow = current_kernel_time();\n",
   "-\ttime = now.tv_sec;\n",
   "+\ttime = ktime_get_real_seconds();\n",
-  " \tif (key->revoked_at = 0 || key->revoked_at > time) {\n",
+  " \tif (key->revoked_at == 0 || key->revoked_at > time) {\n",
   " \t\tkey->revoked_at = time;\n",
   " \t\tkey_schedule_gc(key->revoked_at + key_gc_delay);\n",
   "diff --git a/security/keys/keyring.c b/security/keys/keyring.c\n",
@@ -365,7 +375,7 @@
   " \trcu_read_lock();\n",
   " \n",
   " \t/* come up with a suitable timeout value */\n",
-  " \tif (key->expiry = 0) {\n",
+  " \tif (key->expiry == 0) {\n",
   " \t\tmemcpy(xbuf, \"perm\", 5);\n",
   "-\t} else if (now.tv_sec >= key->expiry) {\n",
   "+\t} else if (now >= key->expiry) {\n",
@@ -409,4 +419,4 @@
   "1.7.9.5"
 ]
 
-08758caffb17a4509a5bb643a50a05cb62f76b0abfc5fe7ee4f11d66207d45dc
+40eab8ec7904c30773a88ba79dbe8b76ce699fc42240bf2f78cc34bc5d9b68aa

diff --git a/a/1.txt b/N2/1.txt
index 5873603..afac1d7 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -229,7 +229,7 @@ index 83da68d..291a67c 100644
 -	now = current_kernel_time();
 -	time = now.tv_sec;
 +	time = ktime_get_real_seconds();
- 	if (key->revoked_at = 0 || key->revoked_at > time) {
+ 	if (key->revoked_at == 0 || key->revoked_at > time) {
  		key->revoked_at = time;
  		key_schedule_gc(key->revoked_at + key_gc_delay);
 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
@@ -343,7 +343,7 @@ index bf08d02..95c8720 100644
  	rcu_read_lock();
  
  	/* come up with a suitable timeout value */
- 	if (key->expiry = 0) {
+ 	if (key->expiry == 0) {
  		memcpy(xbuf, "perm", 5);
 -	} else if (now.tv_sec >= key->expiry) {
 +	} else if (now >= key->expiry) {
@@ -384,4 +384,9 @@ index 86bced9..c691e09 100644
  error:
  	put_cred(ctx.cred);
 -- 
-1.7.9.5
\ No newline at end of file
+1.7.9.5
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 958796f..ee5781b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1505960744.git.baolin.wang\@linaro.org\0"
 ]
 [
-  "From\0Baolin Wang <baolin.wang\@linaro.org>\0"
+  "From\0baolin.wang\@linaro.org (Baolin Wang)\0"
 ]
 [
   "Subject\0[PATCH v2 1/2] security: keys: Replace time_t/timespec with time64_t\0"
 ]
 [
-  "Date\0Thu, 21 Sep 2017 02:32:02 +0000\0"
+  "Date\0Thu, 21 Sep 2017 10:32:02 +0800\0"
 ]
 [
   "To\0linux-security-module\@vger.kernel.org\0"
@@ -251,7 +251,7 @@
   "-\tnow = current_kernel_time();\n",
   "-\ttime = now.tv_sec;\n",
   "+\ttime = ktime_get_real_seconds();\n",
-  " \tif (key->revoked_at = 0 || key->revoked_at > time) {\n",
+  " \tif (key->revoked_at == 0 || key->revoked_at > time) {\n",
   " \t\tkey->revoked_at = time;\n",
   " \t\tkey_schedule_gc(key->revoked_at + key_gc_delay);\n",
   "diff --git a/security/keys/keyring.c b/security/keys/keyring.c\n",
@@ -365,7 +365,7 @@
   " \trcu_read_lock();\n",
   " \n",
   " \t/* come up with a suitable timeout value */\n",
-  " \tif (key->expiry = 0) {\n",
+  " \tif (key->expiry == 0) {\n",
   " \t\tmemcpy(xbuf, \"perm\", 5);\n",
   "-\t} else if (now.tv_sec >= key->expiry) {\n",
   "+\t} else if (now >= key->expiry) {\n",
@@ -406,7 +406,12 @@
   " error:\n",
   " \tput_cred(ctx.cred);\n",
   "-- \n",
-  "1.7.9.5"
+  "1.7.9.5\n",
+  "\n",
+  "--\n",
+  "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n",
+  "the body of a message to majordomo at vger.kernel.org\n",
+  "More majordomo info at  http://vger.kernel.org/majordomo-info.html"
 ]
 
-08758caffb17a4509a5bb643a50a05cb62f76b0abfc5fe7ee4f11d66207d45dc
+3e2dec25f63c6280df6a9a4bed83f6ba104c80213c2ad9656015034a2707b8b6

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.