Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbbF1N2H (ORCPT ); Sun, 28 Jun 2015 09:28:07 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:46244 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752704AbbF1N15 (ORCPT ); Sun, 28 Jun 2015 09:27:57 -0400 X-Greylist: delayed 596 seconds by postgrey-1.27 at vger.kernel.org; Sun, 28 Jun 2015 09:27:57 EDT X-Sasl-enc: 4VkvfsfFvTO+CV/YOXhl5061E8I5ZOo7qsJJwTxIXX0S 1435497486 From: Sergei Zviagintsev To: Greg Kroah-Hartman , Daniel Mack , David Herrmann , Djalal Harouni Cc: linux-kernel@vger.kernel.org, Sergei Zviagintsev Subject: [PATCH RFC 4/5] kdbus: handle WARN_ON cases properly when decrementing quota Date: Sun, 28 Jun 2015 16:17:33 +0300 Message-Id: <1435497454-10464-5-git-send-email-sergei@s15v.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1435497454-10464-1-git-send-email-sergei@s15v.net> References: <1435497454-10464-1-git-send-email-sergei@s15v.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1032 Lines: 37 If we spotted inconsistency, fix it by setting values to zero. Signed-off-by: Sergei Zviagintsev --- ipc/kdbus/connection.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c index 1d44e280eff0..12e32de310f5 100644 --- a/ipc/kdbus/connection.c +++ b/ipc/kdbus/connection.c @@ -742,9 +742,15 @@ void kdbus_conn_quota_dec(struct kdbus_conn *c, struct kdbus_user *u, if (!WARN_ON(quota->msgs == 0)) --quota->msgs; - if (!WARN_ON(quota->memory < memory)) + + if (WARN_ON(quota->memory < memory)) + quota->memory = 0; + else quota->memory -= memory; - if (!WARN_ON(quota->fds < fds)) + + if (WARN_ON(quota->fds < fds)) + quota->fds = 0; + else quota->fds -= fds; } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/