1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 95b67281cd2a..f98a097e73f2 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -84,9 +84,14 @@ static struct devres_group * node_to_group(struct devres_node *node)
 static __always_inline struct devres * alloc_dr(dr_release_t release,
                                                 size_t size, gfp_t gfp, int nid)
 {
-        size_t tot_size = sizeof(struct devres) + size;
+        size_t tot_size;
         struct devres *dr;
 
+        /* We must catch any near-SIZE_MAX cases that could overflow. */
+        if (unlikely(check_add_overflow(sizeof(struct devres), size,
+                                        &tot_size)))
+                return NULL;
+
         dr = kmalloc_node_track_caller(tot_size, gfp, nid);
         if (unlikely(!dr))
                 return NULL;