fs: nvs: fix invalid block compare when data CRC is enabled

When nvs_write is called, the nvs_flash_block_cmp is used to check if
the new data to be written matches the data already on flash. This check
always fail when CONFIG_NVS_DATA_CRC is enabled, caused by the
NVS_DATA_CRC_SIZE being added to the len parameter. The pointer to the
new data does not already have the CRC part added, while the data on
flash does, and the size to be compared includes CRC section.
By removing the addition of NVS_DATA_CRC_SIZE to the compare size, only
the data without CRC is compared, which will make the compare work in
both cases.

Signed-off-by: Yonas Alizadeh <[email protected]>

Author: yolaval

subsys/fs/nvs/nvs.c

@@ -1136,7 +1136,10 @@ ssize_t nvs_write(struct nvs_fs *fs, uint16_t id, const void *data, size_t len)
 		} else if (len + NVS_DATA_CRC_SIZE == wlk_ate.len) {
 			/* do not try to compare if lengths are not equal */
 			/* compare the data and if equal return 0 */
-			rc = nvs_flash_block_cmp(fs, rd_addr, data, len + NVS_DATA_CRC_SIZE);
+			/* note: data CRC is not taken into account here, as it has not yet been
+			 * appended to the data buffer
+			 */
+			rc = nvs_flash_block_cmp(fs, rd_addr, data, len);
 			if (rc <= 0) {
 				return rc;
 			}