Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nfs-utils: fix format strings in nfsdcld
- Loading branch information
Showing
2 changed files
with
104 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| diff -ru3 nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c | ||
| --- nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c 2019-05-10 22:09:49.000000000 +0300 | ||
| +++ nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c 2019-06-06 15:57:54.384549915 +0300 | ||
| @@ -57,6 +57,7 @@ | ||
| #include <stdlib.h> | ||
| #include <stdint.h> | ||
| #include <limits.h> | ||
| +#include <inttypes.h> | ||
| #include <sqlite3.h> | ||
| #include <linux/limits.h> | ||
|
|
||
| @@ -535,7 +536,7 @@ | ||
| xlog(L_ERROR, "Unable to begin transaction: %s", err); | ||
| goto rollback; | ||
| } | ||
| - ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", | ||
| + ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", | ||
| current_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -550,7 +551,7 @@ | ||
| xlog(L_ERROR, "Unable to clear records from current epoch: %s", err); | ||
| goto rollback; | ||
| } | ||
| - ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" " | ||
| + ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016" PRIx64 "\" " | ||
| "SELECT id FROM attached.clients;", | ||
| current_epoch); | ||
| if (ret < 0) { | ||
| @@ -703,7 +704,7 @@ | ||
| int ret; | ||
| sqlite3_stmt *stmt = NULL; | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" " | ||
| + ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016" PRIx64 "\" " | ||
| "VALUES (?);", current_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -748,7 +749,7 @@ | ||
| int ret; | ||
| sqlite3_stmt *stmt = NULL; | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" " | ||
| + ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\" " | ||
| "WHERE id==?;", current_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -798,7 +799,7 @@ | ||
| int ret; | ||
| sqlite3_stmt *stmt = NULL; | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016lx\" " | ||
| + ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016" PRIx64 "\" " | ||
| "WHERE id==?;", recovery_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -873,7 +874,7 @@ | ||
| tcur++; | ||
|
|
||
| ret = snprintf(buf, sizeof(buf), "UPDATE grace " | ||
| - "SET current = %ld, recovery = %ld;", | ||
| + "SET current = %" PRId64 ", recovery = %" PRId64 ";", | ||
| (int64_t)tcur, (int64_t)trec); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -891,7 +892,7 @@ | ||
| goto rollback; | ||
| } | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" " | ||
| + ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016" PRIx64 "\" " | ||
| "(id BLOB PRIMARY KEY);", | ||
| tcur); | ||
| if (ret < 0) { | ||
| @@ -915,7 +916,7 @@ | ||
| * values in the grace table, just clear out the records for | ||
| * the current reboot epoch. | ||
| */ | ||
| - ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", | ||
| + ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", | ||
| tcur); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -976,7 +977,7 @@ | ||
| goto rollback; | ||
| } | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";", | ||
| + ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016" PRIx64 "\";", | ||
| recovery_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); | ||
| @@ -1027,7 +1028,7 @@ | ||
| return -EINVAL; | ||
| } | ||
|
|
||
| - ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";", | ||
| + ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016" PRIx64 "\";", | ||
| recovery_epoch); | ||
| if (ret < 0) { | ||
| xlog(L_ERROR, "sprintf failed!"); |
7e6756aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @vcunat. I'm going to propose this patch upstream later. Thanks for the ping!
7e6756aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I believe that's correct, assuming they're all
(u)int64_t. Thanks for the lightning-fast fix.EDIT: well, the strict compiler would apparently complain if the length was mismatched, so that guards us :-)