From nobody Thu Mar 10 23:51:26 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0D51E19FAFF3; Thu, 10 Mar 2022 23:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KF5SG5RPCz3lNh; Thu, 10 Mar 2022 23:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646956286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=980ilLXQ8WH3CMPTSTohteyfxW9qMNX8IkFCKfFGdU4=; b=ZqHHPfhivH/P83l5FMF/JQdUwR2REurPKqWqR5mTeWLRlYQnGaCdKyEddgUvBO+Q6KhpUY JGrPUMd8kEbv5WOUQCTWBQyMz4uWAOyazigRgVfT4MvPy1mooSdRqgekqELuetWrF7eeBp PtUndHbkBPQJJvaSWu+xP9HmFRIME0UDfAx4+TLOYPjQ+3Kkp/EWtTqf9DfSt7hNs91B7l 25hurvLA0YDTXuBcuY40y6U4IhdcQWfrNCxxJove7CJ7VkQZ6y4PpwjIXmT8aC9H3nq+GO N8kO4hpOwEiX2j5B4mIpvDsVnbpN847co3DKQKBOvtLv2WvY2jjnj18SNZDHXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8041B6953; Thu, 10 Mar 2022 23:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22ANpQcD036888; Thu, 10 Mar 2022 23:51:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ANpQ75036887; Thu, 10 Mar 2022 23:51:26 GMT (envelope-from git) Date: Thu, 10 Mar 2022 23:51:26 GMT Message-Id: <202203102351.22ANpQ75036887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c6a43f7f10b1 - main - iser: Fix check for opcodes in iser_conn_pdu_append_data. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6a43f7f10b183469c3804cfb31b29b6d938621b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646956286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=980ilLXQ8WH3CMPTSTohteyfxW9qMNX8IkFCKfFGdU4=; b=SecHuWe3ARLITtNseiBmy8zJWgqdJIUFgUGswzfJpDAupa9lUlbRGSqurmOInJ4RGTOXKB ZAf2s+BFpmothPXVWvNMbYLIubttxCoKA4QDm+hc7BclLCN8hrfpVRuH3abXs+guuPjArd uxq9MLizNNLDnEx5+Csq2BghJ1pV4SPGUfiUus9dEVstfBCLaVA4MzUEYJAR9dtOfJnD6T WI/P/4hWGpqnMBtl4ydi5lQAM0I/u5Nr9OcOW/LGWeiQC5u0U8srgxQmwIcG+/eQHftgh+ sMRNl3yixJFxJterr9E9EiPKmfdholcVOqBCa5ZeuGkDYLdvko7CWmdRrOVKVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646956286; a=rsa-sha256; cv=none; b=njnI2n0FBD44uzRwgB2c6FzFmmD/Q8kONs123M/M05Zuwhloq5JZ+vSFhYMx55aQ63jTvQ HXnCjSW1HjSZ/swlJ2AnWWVu12zak1sIDbXEGo0fFCi2orrI650N7eTHpziCvAREGCa690 /Ko+vXrKDj01YiRqK7RT6TAlXAs+nsnBN0v+GJIuFicly1VBFIodbl3bqUUZab3T31ZYU3 p1ggCVmcsMUygFIPdNpxKW3seHdFbYRTJ6xCcwCaDne87/A7ETyjdD3Gwlzj3LMXqlkvVE 0igH2VfWX3/MoyTA23OIhiKJk88WqeAU3POsKHn3/pKtqnwlhR4+NtpM0CVuvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c6a43f7f10b183469c3804cfb31b29b6d938621b commit c6a43f7f10b183469c3804cfb31b29b6d938621b Author: John Baldwin AuthorDate: 2022-03-10 23:49:37 +0000 Commit: John Baldwin CommitDate: 2022-03-10 23:49:37 +0000 iser: Fix check for opcodes in iser_conn_pdu_append_data. Reviewed by: mav Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34487 --- sys/dev/iser/icl_iser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/iser/icl_iser.c b/sys/dev/iser/icl_iser.c index f3780a441e01..2c2514a1422b 100644 --- a/sys/dev/iser/icl_iser.c +++ b/sys/dev/iser/icl_iser.c @@ -114,11 +114,13 @@ iser_conn_pdu_append_data(struct icl_conn *ic, struct icl_pdu *request, { struct iser_conn *iser_conn = icl_to_iser_conn(ic); - if (request->ip_bhs->bhs_opcode & ISCSI_BHS_OPCODE_LOGIN_REQUEST || - request->ip_bhs->bhs_opcode & ISCSI_BHS_OPCODE_TEXT_REQUEST) { + switch (request->ip_bhs->bhs_opcode & ISCSI_OPCODE_MASK) { + case ISCSI_BHS_OPCODE_LOGIN_REQUEST: + case ISCSI_BHS_OPCODE_TEXT_REQUEST: ISER_DBG("copy to login buff"); memcpy(iser_conn->login_req_buf, addr, len); request->ip_data_len = len; + break; } return (0);