Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8470CC282E1 for ; Wed, 24 Apr 2019 17:48:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 558FC21773 for ; Wed, 24 Apr 2019 17:48:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t/ashBsL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388547AbfDXRsv (ORCPT ); Wed, 24 Apr 2019 13:48:51 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:39986 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391058AbfDXRa4 (ORCPT ); Wed, 24 Apr 2019 13:30:56 -0400 Received: by mail-oi1-f194.google.com with SMTP id k10so4451214oik.7 for ; Wed, 24 Apr 2019 10:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3sJl7fFJmhYAfO+njJzy/nASu7SADIHx4GwiTnb4W4Q=; b=t/ashBsLk0Ds2jeDT3BtSGCWDm4QLoHbVddkQBL6YVzv/bEO/q53ElJzn9+0A82sPY CIz/Q3GsJ4gesQ4e8+BxqPtagV+rAuo4qSgU1Pi6xwjV/ChJqEG7XWCGoUhLJqw5yfcv xqxydHONsI6SaX8Boe0S/ORICAxRS+1cObs/d3mf3oovXRfExkMuARKtO+Z55lD2MMpk fU7VPAnOQN+irLsWXT2Tsgp9et1nUkK6ac/Rjc+yDCerVtZmmkEKNgt+IMLih4HBJ4vj m3S1epz9CvtEz0hkULlxXF2t3qJSWtQCNdlyjYf5pepQAmuNbzA8wsvOEEnZ254s3WIq 1TqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3sJl7fFJmhYAfO+njJzy/nASu7SADIHx4GwiTnb4W4Q=; b=isFTrrcImqCsxYcpBgPC5hNBuS+2BnzXPUDv0yMTxrtS6Jd68p7gRtWXWLGoppuopf 1NJJgL3Z2pK+Cta2WK2Q8pdaBgIVYVObAw3TgQdgdeuyAwpZ2OVskU8vmM2wb99JNNk2 gpR2OQhXuqrrsOxyNYwSzMfvD0osqffNXXQ1qHAJYV/O7NW1+y933hrSe8zB4M9LnaDf gaKzLyX3mr4uK8WKKAjrz3xDT2QWV99nyfV3FbgbJxQ+g+hmxs+RBCiN94N+0gP2TgaZ Mi9ryvmZByvGfgoPmIWKkCIr6fv8AR/sofEoz9pjUibvNpkKHOgyayo9moyX3zYAtIob MwaA== X-Gm-Message-State: APjAAAUa4UajBy39PcE+/fxULmDEjpV6r2QOkHxQZDmogLWK3Dq3IjVt +1aSLfzmPW9YZfeM6kh7Aw== X-Google-Smtp-Source: APXvYqwFXmZNftHLqxLrIaTM9Qofgs9lQAhoNXtJhvMFJkVtFHbuPgxumgMvAw+90rNaur7h3/GAQA== X-Received: by 2002:aca:d617:: with SMTP id n23mr146349oig.164.1556127054544; Wed, 24 Apr 2019 10:30:54 -0700 (PDT) Received: from serve.minyard.net ([47.184.134.43]) by smtp.gmail.com with ESMTPSA id o10sm8279335oif.41.2019.04.24.10.30.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2019 10:30:50 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id C49ED1800D3; Wed, 24 Apr 2019 17:30:48 +0000 (UTC) Received: by t430.minyard.net (Postfix, from userid 1000) id 8FC4C301154; Wed, 24 Apr 2019 12:30:47 -0500 (CDT) From: minyard@acm.org To: openipmi-developer@lists.sourceforge.net, Kamlakant Patel Cc: Jayachandran Chandrasekharan Nair , Corey Minyard , stable@vger.kernel.org Subject: [PATCH 2/4] ipmi:ssif: compare block number correctly for multi-part return messages Date: Wed, 24 Apr 2019 12:30:42 -0500 Message-Id: <20190424173044.25804-3-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190424173044.25804-1-minyard@acm.org> References: <20190424173044.25804-1-minyard@acm.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kamlakant Patel According to ipmi spec, block number is a number that is incremented, starting with 0, for each new block of message data returned using the middle transaction. Here, the 'blocknum' is data[0] which always starts from zero(0) and 'ssif_info->multi_pos' starts from 1. So, we need to add +1 to blocknum while comparing with multi_pos. Fixes: 7d6380cd40f79 ("ipmi:ssif: Fix handling of multi-part return messages"). Reported-by: Kiran Kolukuluru Signed-off-by: Kamlakant Patel Message-Id: <1556106615-18722-1-git-send-email-kamlakantp@marvell.com> [Also added a debug log if the block numbers don't match.] Signed-off-by: Corey Minyard Cc: stable@vger.kernel.org # 4.4 --- drivers/char/ipmi/ipmi_ssif.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index 8b5aec5430f1..aaccb0ff1ea6 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c @@ -727,12 +727,16 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, /* End of read */ len = ssif_info->multi_len; data = ssif_info->data; - } else if (blocknum != ssif_info->multi_pos) { + } else if (blocknum + 1 != ssif_info->multi_pos) { /* * Out of sequence block, just abort. Block * numbers start at zero for the second block, * but multi_pos starts at one, so the +1. */ + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "Received message out of sequence, expected %u, got %u\n", + ssif_info->multi_pos - 1, blocknum); result = -EIO; } else { ssif_inc_stat(ssif_info, received_message_parts); -- 2.17.1