Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ccc5011 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Prasad Sodagudi
Browse files

lib/ubsan: remove returns-nonnull-attribute checks 

Similarly to type mismatch checks, new GCC 8.x and Clang also changed for
ABI for returns_nonnull checks.  While we can update our code to conform
the new ABI it's more reasonable to just remove it.  Because it's just
dead code, we don't have any single user of returns_nonnull attribute in
the whole kernel.

And AFAIU the advantage that this attribute could bring would be mitigated
by -fno-delete-null-pointer-checks cflag that we use to build the kernel.
So it's unlikely we will have a lot of returns_nonnull attribute in
future.

So let's just remove the code, it has no use.

Change-Id: I479d6f1355781017abdee33f5adf8fd3fdbe4304
[aryabinin@virtuozzo.com: fix warning]
  Link: http://lkml.kernel.org/r/20180122165711.11510-1-aryabinin@virtuozzo.com
Link: http://lkml.kernel.org/r/20180119152853.16806-2-aryabinin@virtuozzo.com


Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Sodagudi Prasad <psodagud@codeaurora.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Git-commit: bac7a1fff7926fb9891a18fe33650884b0e13e41
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarPrasad Sodagudi <psodagud@codeaurora.org>
parent 0eaa11b6

lib/ubsan.c

+0 −24
Original line number Original line 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 DEFINE_SPINLOCK(report_lock);





static void ubsan_prologue(struct source_location *location,

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);

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,

void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,

					unsigned long bound)

					unsigned long bound)

{

{

lib/ubsan.h

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

	int arg_index;

};

};





struct nonnull_return_data {

	struct source_location location;

	struct source_location attr_location;

};



struct vla_bound_data {

struct vla_bound_data {

	struct source_location location;

	struct source_location location;

	struct type_descriptor *type;

	struct type_descriptor *type;

scripts/Makefile.ubsan

+0 −1
Original line number Original line 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=signed-integer-overflow)

      CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)

      CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)

      CFLAGS_UBSAN += $(call cc-option, -fsanitize=object-size)

      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=bool)

      CFLAGS_UBSAN += $(call cc-option, -fsanitize=enum)

      CFLAGS_UBSAN += $(call cc-option, -fsanitize=enum)