udf: Fix meaning of ENTITYID_FLAGS_* macros to be really bitwise-or flags (49be68c4) · Commits · 戴 / test

Currently ENTITYID_FLAGS_* macros definitions are written as hex numbers but their meaning is not bitwise-or flags. But rather bit position. This is unusual and could be misleading. So change meaning of ENTITYID_FLAGS_* macros definitions to be really bitwise-or flags. Link: https://lore.kernel.org/r/20200112221353.29711-1-pali.rohar@gmail.com Signed-off-by:

Pali Rohár <pali.rohar@gmail.com> Signed-off-by:

Jan Kara <jack@suse.cz>

fs/udf/ecma_167.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,8 +95,8 @@ struct regid {
		} __packed;

		/* Flags (ECMA 167r3 1/7.4.1) */
		#define ENTITYID_FLAGS_DIRTY 0x00
		#define ENTITYID_FLAGS_PROTECTED 0x01
		#define ENTITYID_FLAGS_DIRTY 0x01
		#define ENTITYID_FLAGS_PROTECTED 0x02

		/* Volume Structure Descriptor (ECMA 167r3 2/9.1) */
		#define VSD_STD_ID_LEN 5

fs/udf/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ static int udf_verify_domain_identifier(struct super_block *sb,
		udf_warn(sb, "Not OSTA UDF compliant %s descriptor.\n", dname);
		goto force_ro;
		}
		if (ident->flags & (1 << ENTITYID_FLAGS_DIRTY)) {
		if (ident->flags & ENTITYID_FLAGS_DIRTY) {
		udf_warn(sb, "Possibly not OSTA UDF compliant %s descriptor.\n",
		dname);
		goto force_ro;

Admin message