From patchwork Tue Dec 6 22:15:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 129831 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0C7B1007D7 for ; Wed, 7 Dec 2011 09:16:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754816Ab1LFWP5 (ORCPT ); Tue, 6 Dec 2011 17:15:57 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:62053 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754813Ab1LFWP4 (ORCPT ); Tue, 6 Dec 2011 17:15:56 -0500 Received: by lagp5 with SMTP id p5so1832677lag.19 for ; Tue, 06 Dec 2011 14:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=HwpjJmh59hWqJ+37hhrV1HopoqdqPih8TWD/73LhdgY=; b=d/1UpNzvjsbhSE/AZgD1sHotOF/Ye49l350qTFnHAIHxj4Yb3XNAIXBE/V7SIHE01N xWD64XXq+v8b14I4EmEXvxiSlWYfInF+V7Rgk/eld6x6HlkgmIu59HHwWPkOgNtBhItk DVo9HJCkfqISgBlyYyP9amzIuLv9QzSoWi/AM= Received: by 10.152.104.1 with SMTP id ga1mr10062089lab.40.1323209755446; Tue, 06 Dec 2011 14:15:55 -0800 (PST) Received: from localhost.localdomain (cm-188.126.199.228.customer.telag.net. [188.126.199.228]) by mx.google.com with ESMTPS id ni5sm22208120lab.3.2011.12.06.14.15.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 14:15:54 -0800 (PST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: netdev@vger.kernel.org, David Miller Cc: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCHv2 net-next 2/4] caif: Bad assert triggering false positive. Date: Tue, 6 Dec 2011 23:15:42 +0100 Message-Id: <1323209744-9718-2-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1323209744-9718-1-git-send-email-sjur.brandeland@stericsson.com> References: <1323209744-9718-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix bad assert on fragment size triggering false positive. Signed-off-by: Sjur Brændeland --- net/caif/cfrfml.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c index 81660f8..6dc75d4 100644 --- a/net/caif/cfrfml.c +++ b/net/caif/cfrfml.c @@ -190,7 +190,7 @@ out: static int cfrfml_transmit_segment(struct cfrfml *rfml, struct cfpkt *pkt) { - caif_assert(cfpkt_getlen(pkt) < rfml->fragment_size); + caif_assert(cfpkt_getlen(pkt) < rfml->fragment_size + RFM_HEAD_SIZE); /* Add info for MUX-layer to route the packet out. */ cfpkt_info(pkt)->channel_id = rfml->serv.layer.id;