From patchwork Tue Mar 4 11:08:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Szapar-Mudlaw, Martyna" X-Patchwork-Id: 14000474 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44C521FECCC for ; Tue, 4 Mar 2025 11:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086579; cv=none; b=pvoWtJUXoq8kZN3PBcJ8dMumjculTQUoowTFDRkroKikWH75VWTgTv6j+Bh4ANK1PIZQ8Bax92tIdnnZmRMLu+yKVA62LfMf1pdznks6fvzQkhc1VTDJ2VnkgAVP0oQgz11cUDhKru5D3i1N4tGEGAHUWzHhhVZzkGBwuU/ku58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086579; c=relaxed/simple; bh=qiOP6gb3TLfVUmI4JgcMNTSV7pK1WOQuDIMIDiHkvH8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fYjOusREZuChz4tqrLKFteJW1oU9+/MYa/bUi4X0vYbvEZM6jIbIiYpy04wqbD0E7//5/jwz/KvzcUumz2Rgx6AAX6dGwoysnk4oDzVJ5A9lmnZqUmShRFWe6oSQ/MGvjFJOvM7TCVe1aQkQBuQXgl7KThjsOBoUu/8rj+3093c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=b3V1gDd3; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="b3V1gDd3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741086578; x=1772622578; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qiOP6gb3TLfVUmI4JgcMNTSV7pK1WOQuDIMIDiHkvH8=; b=b3V1gDd3aZOotawktw0aDvG58z0Bxedx+RPoHPKbGO+BEvnvXkw9/GG1 RPegoiI2tPUeRU5WctnAO185K0YWU5d/W1z4j9SuLzXdTe+NHMGl11bAi JTOBd1k0TaWFqxDrZd5cseEdhA6j9Y9ifOKjSoh+tv3WwU6VXcHsXZ0qR zndSi7iP+hBE97ys9KNnW5JbzDdT5fiatj0n6nXN01/xl9iRQeCPL7qKi 0CpVzA49GJfUUeHxZA+axpGHkbq4LZalLCr15c0jLC4TGzfLKv1gH+llQ qsov9j1ffElt6PN/vULwYBm0NpK2yIZIGKi7D6qWxiaz0+r/LEUn4ywab g==; X-CSE-ConnectionGUID: 6UcFNpOEQdiidAQ8saLP2g== X-CSE-MsgGUID: bn/JesaaS1GV7ICogqPSxA== X-IronPort-AV: E=McAfee;i="6700,10204,11362"; a="41247084" X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="41247084" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2025 03:09:37 -0800 X-CSE-ConnectionGUID: kAA3rgkLQay6ZsN+609Kog== X-CSE-MsgGUID: 8wuO6+UZS+mHJOFQEucJ+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,331,1732608000"; d="scan'208";a="118341573" Received: from enterprise.igk.intel.com ([10.102.20.175]) by fmviesa007.fm.intel.com with ESMTP; 04 Mar 2025 03:09:36 -0800 From: Martyna Szapar-Mudlaw To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Mateusz Polchlopek , Przemek Kitszel , Martyna Szapar-Mudlaw Subject: [iwl-net v3 5/5] ice: fix using untrusted value of pkt_len in ice_vc_fdir_parse_raw() Date: Tue, 4 Mar 2025 12:08:36 +0100 Message-ID: <20250304110833.95997-9-martyna.szapar-mudlaw@linux.intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250304110833.95997-2-martyna.szapar-mudlaw@linux.intel.com> References: <20250304110833.95997-2-martyna.szapar-mudlaw@linux.intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Mateusz Polchlopek Fix using the untrusted value of proto->raw.pkt_len in function ice_vc_fdir_parse_raw() by verifying if it does not exceed the VIRTCHNL_MAX_SIZE_RAW_PACKET value. Fixes: 99f419df8a5c ("ice: enable FDIR filters from raw binary patterns for VFs") Reviewed-by: Przemek Kitszel Signed-off-by: Mateusz Polchlopek Signed-off-by: Martyna Szapar-Mudlaw --- .../ethernet/intel/ice/ice_virtchnl_fdir.c | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c index 14e3f0f89c78..9be4bd717512 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c @@ -832,21 +832,27 @@ ice_vc_fdir_parse_raw(struct ice_vf *vf, struct virtchnl_proto_hdrs *proto, struct virtchnl_fdir_fltr_conf *conf) { - u8 *pkt_buf, *msk_buf __free(kfree); + u8 *pkt_buf, *msk_buf __free(kfree) = NULL; struct ice_parser_result rslt; struct ice_pf *pf = vf->pf; + u16 pkt_len, udp_port = 0; struct ice_parser *psr; int status = -ENOMEM; struct ice_hw *hw; - u16 udp_port = 0; - pkt_buf = kzalloc(proto->raw.pkt_len, GFP_KERNEL); - msk_buf = kzalloc(proto->raw.pkt_len, GFP_KERNEL); + pkt_len = proto->raw.pkt_len; + + if (!pkt_len || pkt_len > VIRTCHNL_MAX_SIZE_RAW_PACKET) + return -EINVAL; + + pkt_buf = kzalloc(pkt_len, GFP_KERNEL); + msk_buf = kzalloc(pkt_len, GFP_KERNEL); + if (!pkt_buf || !msk_buf) goto err_mem_alloc; - memcpy(pkt_buf, proto->raw.spec, proto->raw.pkt_len); - memcpy(msk_buf, proto->raw.mask, proto->raw.pkt_len); + memcpy(pkt_buf, proto->raw.spec, pkt_len); + memcpy(msk_buf, proto->raw.mask, pkt_len); hw = &pf->hw; @@ -862,7 +868,7 @@ ice_vc_fdir_parse_raw(struct ice_vf *vf, if (ice_get_open_tunnel_port(hw, &udp_port, TNL_VXLAN)) ice_parser_vxlan_tunnel_set(psr, udp_port, true); - status = ice_parser_run(psr, pkt_buf, proto->raw.pkt_len, &rslt); + status = ice_parser_run(psr, pkt_buf, pkt_len, &rslt); if (status) goto err_parser_destroy; @@ -876,7 +882,7 @@ ice_vc_fdir_parse_raw(struct ice_vf *vf, } status = ice_parser_profile_init(&rslt, pkt_buf, msk_buf, - proto->raw.pkt_len, ICE_BLK_FD, + pkt_len, ICE_BLK_FD, conf->prof); if (status) goto err_parser_profile_init; @@ -885,7 +891,7 @@ ice_vc_fdir_parse_raw(struct ice_vf *vf, ice_parser_profile_dump(hw, conf->prof); /* Store raw flow info into @conf */ - conf->pkt_len = proto->raw.pkt_len; + conf->pkt_len = pkt_len; conf->pkt_buf = pkt_buf; conf->parser_ena = true;