Received: by 2002:a17:90a:9307:0:0:0:0 with SMTP id p7csp3965493pjo; Tue, 3 Mar 2020 10:12:35 -0800 (PST) X-Google-Smtp-Source: ADFU+vsmDV0STXWnV1Tn3zuxYyozXRtAVxI5H2i+jVAfi6zeGmPS+phzF142SYqPwLwZKXzmPIZ7 X-Received: by 2002:a05:6830:1250:: with SMTP id s16mr4120375otp.253.1583259155725; Tue, 03 Mar 2020 10:12:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583259155; cv=none; d=google.com; s=arc-20160816; b=w444RulKiZr9+yvr8cTIUMZuArMZzHm2VsY5YCJdzU6s//GhCTNp66ZNmYrQEitDWj rLrealiUSFTGu0xB3SW6iogKN91RGUB7dFca6rXPOL4rQcpvukMdS4//eeFVG9tN9vLT heSCRMiVhBGlLIIRdlb1s5t39OWN2JCJatMsSBX9ywrUlL19pDDdiitYabkxOTcrzoPH LnnIH+0zLSLfNcacmO0CFCGWSo9rs9LMjdIqklCGDn+9RNx8BDm3luGbqpoz441NvIwC EajDiBhYtRqQW4VLf5w2XOWVq+GXdeGoXk87Si8EDFP+x2Ww1zjXj2unnUjikAirzr7V 5NTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=z4Cndl9jrCO0EClGApJIR6sO8tfQnJh1+vvPrFLytNE=; b=WsijzdMu2qRGP5Qzoxw/ijCq86cqU5b7FhCFZQhN6qwafqubwa7OziADZEvpHUFnmT BySX4IZtMALbwe8WwTW1LpoOnbwv6pnxZM2TEYawiks84UODL2DTg524mu9duY8Rumg6 F3MXbV5oZ5Mfjul/4Bn3Pzq6qd1t4owkBB+IyC4I1+okHan37Is/hbYpxUAFvuKu8rRV BRr0GHKOl5UTGHu0z0KjGerZVKFovADOQnnez+s5ZhBsGY0zJtvYCAXtWgLK2P4XtiK5 bkSWaa4BZQZ4QSWOS3EjAnEPMEziUnEV5+xsOOCSG05l+bxAJ12O8Qgq0vRLDp1BCxdf 9Nfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uT2SXvC3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4si8118158oto.169.2020.03.03.10.12.23; Tue, 03 Mar 2020 10:12:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uT2SXvC3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729117AbgCCSLm (ORCPT + 99 others); Tue, 3 Mar 2020 13:11:42 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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));