From patchwork Tue Mar 3 17:43:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229887 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0CFEFC3F2DA for ; Tue, 3 Mar 2020 18:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFE8220656 for ; Tue, 3 Mar 2020 18:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583259105; bh=NN0i0tHCtLVZSlnyj+Teiw6WyrGw6A0NhfaNQrUwBjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zmBZCoGcYvPSrAtYV3i13iUQl4E92o7TJnhFgpv7CuOPpwBHEauI/Up9zimwEw0BH 1XnVgPkcEbLKSowYyS8zam5WmCmg/uv/h6gCjNkDVJQRhMhrmey6Q1KYUtVEb66Z5V k8THP1e1NCpmqO7xda0XRL3O0vr3nihbZrmUeQIU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732192AbgCCSLl (ORCPT ); Tue, 3 Mar 2020 13:11:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:57008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730965AbgCCRtj (ORCPT ); Tue, 3 Mar 2020 12:49:39 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 290882146E; Tue, 3 Mar 2020 17:49:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257778; bh=NN0i0tHCtLVZSlnyj+Teiw6WyrGw6A0NhfaNQrUwBjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uT2SXvC3mKxjyqZg0mgUbSnbyD2+ABto4JooICRCzRQ72m9pil/QEVM6Keqq7R73z B+9ZhKfCQYLthv3XEXsRtURM7bXeIg3c86EHut1VqFfTzcZTx9l2j73nDcY62iG43n 2EsPfq39qz3Z/RDJ8OzOSubpHis1koe40HdwHgXM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julian Wiedmann , "David S. Miller" Subject: [PATCH 5.5 125/176] s390/qeth: fix off-by-one in RX copybreak check Date: Tue, 3 Mar 2020 18:43:09 +0100 Message-Id: <20200303174319.243619643@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Julian Wiedmann commit 54a61fbc020fd2e305680871c453abcf7fc0339b upstream. The RX copybreak is intended as the _max_ value where the frame's data should be copied. So for frame_len == copybreak, don't build an SG skb. Fixes: 4a71df50047f ("qeth: new qeth device driver") Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/s390/net/qeth_core_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -5142,7 +5142,7 @@ next_packet: } use_rx_sg = (card->options.cq == QETH_CQ_ENABLED) || - ((skb_len >= card->options.rx_sg_cb) && + (skb_len > card->options.rx_sg_cb && !atomic_read(&card->force_alloc_skb) && !IS_OSN(card));