Merge "lib/ubsan: remove returns-nonnull-attribute checks" (c8dd3996) · Commits · e / devices / android_kernel_xiaomi_nabu

lib/ubsan.c

+0 −24

Original line number	Diff line number	Diff line
		@@ -141,11 +141,6 @@ static void val_to_string(char str, size_t size, struct type_descriptor type,
		}
		}

		static bool location_is_valid(struct source_location *loc)
		{
		return loc->file_name != NULL;
		}

		static DEFINE_SPINLOCK(report_lock);

		static void ubsan_prologue(struct source_location *location,
		@@ -356,25 +351,6 @@ void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data,
		}
		EXPORT_SYMBOL(__ubsan_handle_type_mismatch_v1);

		void __ubsan_handle_nonnull_return(struct nonnull_return_data *data)
		{
		unsigned long flags;

		if (suppress_report(&data->location))
		return;

		ubsan_prologue(&data->location, &flags);

		pr_err("null pointer returned from function declared to never return null\n");

		if (location_is_valid(&data->attr_location))
		print_source_location("returns_nonnull attribute specified in",
		&data->attr_location);

		ubsan_epilogue(&flags);
		}
		EXPORT_SYMBOL(__ubsan_handle_nonnull_return);

		void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,
		unsigned long bound)
		{

+0 −5

Original line number	Diff line number	Diff line
		@@ -57,11 +57,6 @@ struct nonnull_arg_data {
		int arg_index;
		};

		struct nonnull_return_data {
		struct source_location location;
		struct source_location attr_location;
		};

		struct vla_bound_data {
		struct source_location location;
		struct type_descriptor *type;

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ ifdef CONFIG_UBSAN
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=signed-integer-overflow)
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=object-size)
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=returns-nonnull-attribute)
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=bool)
		CFLAGS_UBSAN += $(call cc-option, -fsanitize=enum)