Received: by 10.223.185.111 with SMTP id b44csp919871wrg; Fri, 9 Mar 2018 16:53:22 -0800 (PST) X-Google-Smtp-Source: AG47ELsbmFmDCAxOdR+rmlcKYuvisoqrL9C+ROkV5WJKQz/B2+RIGYlbLDbAtCQXpTGo/xdtIMXA X-Received: by 10.98.194.219 with SMTP id w88mr400407pfk.26.1520643202666; Fri, 09 Mar 2018 16:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520643202; cv=none; d=google.com; s=arc-20160816; b=Cchqr2R2Xqs8uasgymHTr+M0SQNbUiS9+1uHldiqWP26xorXCSdQaYTCJxfIWPsBAK OWAmnVws5EscnBGMta7Ys3DGed6xjLC1SyvgvdqmnJsqxS+j83vfMXITStefEfIeVI7i iccH4ZVrV5N11hPBDBjuY7rIxc6yfOHmnTJYHzxyfD8/Q6lHrpZxoU9XO4/vklm2Eg0C 9b/KqAd/H0ILk00QllMN7i1snuLQZdPlPhCKZ+0clmQP86je7Vmg2k054+RR2kzPOqFp UCFPdKz8GIN7oISdredRaNRhj1+1+iTW1PSgrq80bpJlajvC6BvjLO6Px8zaw3qhCI10 RyqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=k5LEE/Fhaz12dAhBlUcegOjC6LJtcdVe7hE/q1VikrM=; b=pyU4uHNrYGIgDbvzLXZXFFI016ypCQfu8ld/TXAr3vaOomXvK6Hksf3SEAXGaxxEyz SKXnTct5FQTIaaaRARQw83I6CItzidX7MSmadbISewing6Fg1tu0hIk9R8cPGoqNoTmL +V2fKwSwTR/IViX0jEjAucI13UD68UDXoN1BpdqhdzBcfESODWxD4nrjnmEfMcZd60fI tVgmANu8npxDEj0BPnFF/oHZnpWmMCWNGKDPjkaq/BnbmBlLZxPEXGCEWXMAcv2w2f+W XaH/BkgrNUFp776dmKzCbXVSnEy2ldkj3mYfiis6EKt33wZwY0ft8gqISncSAr0q9OPL py7Q== ARC-Authentication-Results: i=1; mx.google.com; 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 k10si325739pgo.39.2018.03.09.16.53.08; Fri, 09 Mar 2018 16:53:22 -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; 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 S933124AbeCJAvK (ORCPT + 99 others); Fri, 9 Mar 2018 19:51:10 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38596 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932771AbeCJATU (ORCPT ); Fri, 9 Mar 2018 19:19:20 -0500 Received: from localhost (unknown [185.236.200.248]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B9F6CEF8; Sat, 10 Mar 2018 00:19:19 +0000 (UTC) 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 3.18 16/21] s390/qeth: fix SETIP command handling Date: Fri, 9 Mar 2018 16:18:38 -0800 Message-Id: <20180310001802.060960819@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001801.045114869@linuxfoundation.org> References: <20180310001801.045114869@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Julian Wiedmann [ Upstream commit 1c5b2216fbb973a9410e0b06389740b5c1289171 ] send_control_data() applies some special handling to SETIP v4 IPA commands. But current code parses *all* command types for the SETIP command code. Limit the command code check to IPA commands. Fixes: 5b54e16f1a54 ("qeth: do not spin for SETIP ip assist command") Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/s390/net/qeth_core.h | 5 +++++ drivers/s390/net/qeth_core_main.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h @@ -593,6 +593,11 @@ struct qeth_cmd_buffer { void (*callback) (struct qeth_channel *, struct qeth_cmd_buffer *); }; +static inline struct qeth_ipa_cmd *__ipa_cmd(struct qeth_cmd_buffer *iob) +{ + return (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE); +} + /** * definition of a qeth channel, used for read and write */ --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -2023,7 +2023,7 @@ int qeth_send_control_data(struct qeth_c unsigned long flags; struct qeth_reply *reply = NULL; unsigned long timeout, event_timeout; - struct qeth_ipa_cmd *cmd; + struct qeth_ipa_cmd *cmd = NULL; QETH_CARD_TEXT(card, 2, "sendctl"); @@ -2050,10 +2050,13 @@ int qeth_send_control_data(struct qeth_c while (atomic_cmpxchg(&card->write.irq_pending, 0, 1)) ; qeth_prepare_control_data(card, len, iob); - if (IS_IPA(iob->data)) + if (IS_IPA(iob->data)) { + cmd = __ipa_cmd(iob); event_timeout = QETH_IPA_TIMEOUT; - else + } else { event_timeout = QETH_TIMEOUT; + } + timeout = jiffies + event_timeout; QETH_CARD_TEXT(card, 6, "noirqpnd"); @@ -2078,9 +2081,8 @@ int qeth_send_control_data(struct qeth_c /* we have only one long running ipassist, since we can ensure process context of this command we can sleep */ - cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); - if ((cmd->hdr.command == IPA_CMD_SETIP) && - (cmd->hdr.prot_version == QETH_PROT_IPV4)) { + if (cmd && cmd->hdr.command == IPA_CMD_SETIP && + cmd->hdr.prot_version == QETH_PROT_IPV4) { if (!wait_event_timeout(reply->wait_q, atomic_read(&reply->received), event_timeout)) goto time_err;