[PATCH RFC 3/5] kdbus: do explicit overflow check in kdbus_conn_quota_inc()

[Sergei Zviagintsev]

Replace the use of max() with explicit and obvious overflow check.

Signed-off-by: Sergei Zviagintsev <sergei@xxxxxxxx>
---
 ipc/kdbus/connection.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c
index af044f93c14f..1d44e280eff0 100644
--- a/ipc/kdbus/connection.c
+++ b/ipc/kdbus/connection.c
@@ -668,9 +668,11 @@ int kdbus_conn_quota_inc(struct kdbus_conn *c, struct kdbus_user *u,
 
 	id = u ? u->id : KDBUS_USER_KERNEL_ID;
 	if (id >= c->n_quota) {
-		unsigned int users;
+		unsigned int users = KDBUS_ALIGN8(id) + 8;
+
+		if (users < id) /* overflow */
+			users = id;
 
-		users = max(KDBUS_ALIGN8(id) + 8, id);
 		quota = krealloc(c->quota, users * sizeof(*quota),
 				 GFP_KERNEL | __GFP_ZERO);
 		if (!quota)
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/