diff --git a/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c
index 44ea8756b..fbcb08afb 100644
--- a/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c
@@ -1,7 +1,7 @@
 /*
  * gk20a allocator
  *
- * Copyright (c) 2011-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2021, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -89,6 +89,10 @@ void nvgpu_free(struct nvgpu_allocator *a, u64 addr)
 u64 nvgpu_alloc_fixed(struct nvgpu_allocator *a, u64 base, u64 len,
 		      u32 page_size)
 {
+	if ((U64_MAX - base) < len) {
+		return 0ULL;
+	}
+
 	if (a->ops->alloc_fixed != NULL) {
 		return a->ops->alloc_fixed(a, base, len, page_size);
 	}
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 565acf2db..b62574eea 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -1536,7 +1536,6 @@ int nvgpu_vm_map(struct vm_gk20a *vm,
 	mapped_buffer->pgsz_idx     = binfo.pgsz_idx;
 	mapped_buffer->vm           = vm;
 	mapped_buffer->flags        = binfo.flags;
-	nvgpu_assert(map_key_kind >= 0);
 	mapped_buffer->kind         = map_key_kind;
 	mapped_buffer->va_allocated = va_allocated;
 	mapped_buffer->vm_area      = vm_area;
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c
index af8822f88..2fb7593e0 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_area.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_area.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2021, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -50,13 +50,14 @@ int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm,
 	struct gk20a *g = vm->mm->g;
 	struct nvgpu_vm_area *vm_area;
 	struct nvgpu_mapped_buf *buffer;
-	u64 map_end = nvgpu_safe_add_u64(map_addr, map_size);
+	u64 map_end;
 
 	/* can wrap around with insane map_size; zero is disallowed too */
-	if (map_end <= map_addr) {
+	if (((U64_MAX - map_size) < map_addr) || (map_size == 0ULL)) {
 		nvgpu_warn(g, "fixed offset mapping with invalid map_size");
 		return -EINVAL;
 	}
+	map_end = map_addr + map_size;
 
 	if ((map_addr &
 	     nvgpu_safe_sub_u64(U64(vm->gmmu_page_sizes[pgsz_idx]), U64(1)))
@@ -88,7 +89,7 @@ int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm,
 	 * mappings by checking the buffer with the highest GPU VA
 	 * that is less than our buffer end */
 	buffer = nvgpu_vm_find_mapped_buf_less_than(
-		vm, nvgpu_safe_add_u64(map_addr, map_size));
+		vm, map_end);
 	if (buffer != NULL) {
 		if (nvgpu_safe_add_u64(buffer->addr, buffer->size) > map_addr) {
 			nvgpu_warn(g, "overlapping buffer map requested");