mtd-utils.git/ubifs-utils, branch v2.1.2A mirror of http://git.infradead.org/mtd-utils.githttps://git.infraroot.at/mtd-utils.git/atom?h=v2.1.22020-07-13T08:03:42+00:00Add the mkfs.ubifs sign.h header to the list of sources2020-07-13T08:03:42+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2020-07-13T08:03:42+00:00urn:sha1:de84f0b318f3a1ce53e006e3349ab8f3997a275f
The sign.h header added by the authentication patch set was omitted
from the automake file and thus not added to the distribution tarball.
The resulting tarballs were unable to be compiled.
Fixes: a739b59 ("mkfs.ubifs: Add authentication support")
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: fix broken build if fscrtyp is disabled2020-02-09T22:04:41+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2020-02-09T21:46:28+00:00urn:sha1:639b871fe3d2cb3e73d21363e8c13ede2bbd9f99
First, there is no option named of X509_OPTION. It was presumably
changed during development to AUTH_CERT_OPTION. This commit fixes
the name in the !WITH_CRYPTO branch.
Similarly, '}' got moved into the WITH_CRYPTO branch, but not into
else branch, resulting in tons of errors if fscrypt is disabled.
This commit pulls it back out of both branches.
Fixes: a739b59e ("mkfs.ubifs: Add authentication support")
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: propperly cleanup in ALL interpret_table_entry error paths2019-11-10T14:30:03+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T13:12:06+00:00urn:sha1:84502bf120e45a8ce573bdf6e5c07eb9f59a9d6e
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: don't leak temporary buffers2019-11-10T14:29:59+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T12:37:20+00:00urn:sha1:64255d88391b8a531f0d358e22bdf12c0c79cd5d
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: don't leak hastable iterators2019-11-10T14:29:53+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T13:02:12+00:00urn:sha1:19333aa3648663893d190d9ce8c7e45724c1a3bd
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: free derived fscrypt context in add_directory error paths2019-11-10T14:29:53+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T12:46:21+00:00urn:sha1:64e9543eea4089aaf2bcae7f2b3b62b97bbe202f
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: don't leak copied command line arguments2019-11-10T14:29:53+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T12:41:41+00:00urn:sha1:1538c553302dae1df9088ec302a5b2fb5a15174f
For some command line flags, the argument string is copied. Simply
writing over the buffer leads to a resource leak if the same flag
is specified on the command line more than once.
This patch adds a free() call to the old buffer before overwriting
it with the new copy.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: close file descriptor in add_file error path2019-11-10T14:29:53+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T12:38:46+00:00urn:sha1:7386aabf3628379df10612bed7ecb7ab4163cdcf
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: abort add_directory if readdir fails2019-11-10T13:44:24+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T13:40:05+00:00urn:sha1:aa2c234ecb512bc4fc52fa1601377c31dfb58552
The existing code sets 'err' to -1 and breaks the readdir loop, but
the error state is never read. This patch modifies the readdir loop
to actualy jump to the error handling branch if readdir fails.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
mkfs.ubifs: fscrypt: bail from encrypt_block if gen_essiv_salt fails2019-11-10T13:22:53+00:00David Oberhollenzerdavid.oberhollenzer@sigma-star.at2019-11-10T13:17:33+00:00urn:sha1:46c16855b1bed2704549d834acd2e9812ff3bf1e
What originally cought my attention was that gen_essiv_salt has a
size_t return type and error paths that return -1 on failure.
Further investigation revealed that the error value is never checked
for. The encrypt_block function doesn't use the return value in any
way and simply continues onward.
Furthermore, the gen_essiv_salt function has an error case that emits
an error message but returns success state.
This patch modifes gen_essiv_salt to return an error status in all
error branches, changes the return type to ssize_t and adds a check
to encrypt_block if gen_essiv_salt fails.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>