diff for duplicates of <20170317204655.GA28261@mwanda> diff --git a/a/1.txt b/N1/1.txt index 0bfac11..8d0ad27 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,11 +16,11 @@ index ec09bd703b7d..eba218737bdb 100644 @@ -2401,12 +2401,12 @@ static int crypt_ctr_optional(struct dm_target *ti, unsigned int argc, char **ar else if (!strcasecmp(opt_string, "submit_from_crypt_cpus")) set_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags); - else if (sscanf(opt_string, "integrity:%u:", &val) == 1) { + else if (sscanf(opt_string, "integrity:%u:", &val) = 1) { - cc->on_disk_tag_size = val; - sval = strchr(opt_string + strlen("integrity:"), ':') + 1; -- if (val == 0 || val > MAX_TAG_SIZE || !sval) { -+ if (val == 0 || val > MAX_TAG_SIZE) { +- if (val = 0 || val > MAX_TAG_SIZE || !sval) { ++ if (val = 0 || val > MAX_TAG_SIZE) { ti->error = "Invalid integrity arguments"; return -EINVAL; } diff --git a/a/content_digest b/N1/content_digest index 013762c..a3de749 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH] dm crypt: remove an impossible condition\0" - "Date\0Fri, 17 Mar 2017 23:46:56 +0300\0" + "Date\0Fri, 17 Mar 2017 20:46:56 +0000\0" "To\0Alasdair Kergon <agk@redhat.com>" " Milan Broz <gmazyland@gmail.com>\0" "Cc\0Mike Snitzer <snitzer@redhat.com>" @@ -28,11 +28,11 @@ "@@ -2401,12 +2401,12 @@ static int crypt_ctr_optional(struct dm_target *ti, unsigned int argc, char **ar\n" " \t\telse if (!strcasecmp(opt_string, \"submit_from_crypt_cpus\"))\n" " \t\t\tset_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags);\n" - " \t\telse if (sscanf(opt_string, \"integrity:%u:\", &val) == 1) {\n" + " \t\telse if (sscanf(opt_string, \"integrity:%u:\", &val) = 1) {\n" "-\t\t\tcc->on_disk_tag_size = val;\n" "-\t\t\tsval = strchr(opt_string + strlen(\"integrity:\"), ':') + 1;\n" - "-\t\t\tif (val == 0 || val > MAX_TAG_SIZE || !sval) {\n" - "+\t\t\tif (val == 0 || val > MAX_TAG_SIZE) {\n" + "-\t\t\tif (val = 0 || val > MAX_TAG_SIZE || !sval) {\n" + "+\t\t\tif (val = 0 || val > MAX_TAG_SIZE) {\n" " \t\t\t\tti->error = \"Invalid integrity arguments\";\n" " \t\t\t\treturn -EINVAL;\n" " \t\t\t}\n" @@ -42,4 +42,4 @@ " \t\t\t\tset_bit(CRYPT_MODE_INTEGRITY_AEAD, &cc->cipher_flags);\n" " \t\t\t} else if (!strncasecmp(sval, \"hmac(\", strlen(\"hmac(\"))) {" -66177cc13af6a90f7bb899fecf897d926ffb6dda00c259d43a73b2a0bfaf4872 +b69e35313ab814c8630a181de1a4052d62edbbbb785174c7b3af9556541c4f51
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.