From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C17D3E5EF5 for ; Wed, 8 Jul 2026 07:17:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783495058; cv=none; b=XIf9IPD5D5vnAaSKJd6tz1n5G23A8F0kLO2lR8Bf+hAPIMrsg7Lkb8LEL62dpnIYmiBsnSl9TTcWvznX0CMp99+INGhz8UzuaFVFc7MwWXCQM7Z5r5oj/eKkpPzq8X8CtW82Ll8+ttXQrSKN7Pe2GaztX5T64gEfOiYMlUo7528= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783495058; c=relaxed/simple; bh=mhgmvIayRFUvcq9Lv2QvZqem9kwlAlCj2bzo3PhZ4n4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=K5jGdtz4xhIV3nUkCDJe7JD/5z8kkcIKjI2QfEhLfuFHhgJglqyL1MO44zl6aUllcuSaNyox7UUEZq2MfRE9inelezpK07epwlY9cpyy70AuiqAWGJnP0epBocSVBJhdQufIU36pCmOHwQcul9+vB8jTb4btLX4j1WEPgR8Ui8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=I96DrU5z; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I96DrU5z" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-ca2fad0ae38so212840a12.3 for ; Wed, 08 Jul 2026 00:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783495044; x=1784099844; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=h0Biz5zAntBoijadNrUEvs1mg/mB9KZLbipw/JNpHMQ=; b=I96DrU5zxDCKMCfAsXvIJ+45LPXjbPb6tzkI25kLhLcq7hh8XxLGucK1Oagq3MYUUD M3OWNWoe3c5TitwbNXCwHolG/Nt1ugYgK/Z3KOj/JLgzoRw1XDNE001TXZpQ6GNgIVfP /kZ0pVfMHkauiPw7q6Op1rmRWSspxGF6d9Lt80Cb8dFX7DJUyK5/LxaZgWCZIuz7NZxH 3D7KPgWqJr3Hx5pJgzdKtp/Us5t/8c0YuNqKlxk1VOThQGHNNLobAOM6aGzEFqas0NPc ojANgNf8vPowCy38ixiYe0K40uNBzDlrwUAMkFRklZ7uAH/wxZdBw6ydTfiDaapsohj3 aghA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783495044; x=1784099844; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=h0Biz5zAntBoijadNrUEvs1mg/mB9KZLbipw/JNpHMQ=; b=C/e3BV7RX1d/UrcqsxvNDtAgwm2Y2c0L+9RXUCvpyw58AP+4a804RDsKtfdoYdjMod 6HcT4XO/LQu3feH3A1BtlIzDL+jIl4moSpRNzTw3JGgA3GMbyhKuEl1x0cJ47kVJwXdn 5oOiss3yTO/BqILyJjiTHrQKO0UFRas4uyNoLM5qblnnpnpPHEy+koDUGPzGa87F63D5 iwUArSwim5qkoqwLD8rlcobw6Uwo1kugTJfirf9xE4/GdQV4yZ+dHPxMGFfXRBwwvcmF c9Q7HGONyoQHCy90mp+MEdVs5iEq56N4zUmUbRT27JwcinTauNE3wN3pWGRtodmewkab KIyA== X-Forwarded-Encrypted: i=1; AHgh+RpIIHXtKbayqhdLDBvn5wwYASwzU7WlPTEv7cpUmRIqaeQjBQc5TRVZKEgn0vOrSzQV98TrjqGD7gtGtT8=@vger.kernel.org X-Gm-Message-State: AOJu0YynxyD71QTnIwpwISzkCe3k/AoQjXJAI7dUI+rj/HptJB7SA7pl Qgj6GWSdzoyh4y/VJoQHxzInHtHEcOB+2NqDwyBDKVwN2DdeU25mw0YF X-Gm-Gg: AfdE7ckaE1nvQryIcDIGFY98att1xsmcFUeY4yKV//BR8VQiQ1ADvJhK7VnVYeputyd PaDo97FTgzaMnGw9Akap74JKnww9f1xJnTPAqn94Yuk4ki+h0N783Vsjd3c2ACLearEK3VAvLwz o7x8m7rrVKTdv9cbS2F4+R4jCpI86fk04/b4nYym2Ld+giANYedPAh/9OrWirlc6ajEG7zwygM7 dnmOZGO0dFdPwSFa3ZotZVWi2MomoHy+GefclrGQzin8iSETjS6TYjdR/p4ygRXgDOpif/9fs/p UyhGFOZdSMJRZAqWVxdkBHJ7bMWhErkSpGCsFN5foakjqqJTMmR/FEQbyn3KOzYTuNc6Un0FsfI jgaG8+vXCQFPSgbmrs2Oy5yDIR2IHxR7apjHjbBvcYUPit1HXpmuj945n+zjQexz+To4LYro= X-Received: by 2002:a05:6a20:748a:b0:3bf:ab02:439e with SMTP id adf61e73a8af0-3c0bd0420b3mr1543741637.27.1783495044471; Wed, 08 Jul 2026 00:17:24 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ca5b3b25204sm1972985a12.28.2026.07.08.00.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 00:17:23 -0700 (PDT) From: Guangshuo Li To: Matthew Brost , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi , David Airlie , Simona Vetter , Michal Wajdeczko , =?UTF-8?q?Micha=C5=82=20Winiarski?= , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] drm/xe/pf: clear pending packet on header init failure Date: Wed, 8 Jul 2026 15:15:02 +0800 Message-ID: <20260708071502.722393-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit xe_sriov_packet_write_single() keeps a partially written restore packet in the per-VF pending slot across write() calls. When the header becomes complete, xe_sriov_packet_init_from_hdr() sets data->remaining from the user supplied header before initializing the packet backing storage. If that initialization fails, for example because the header contains an invalid gt_id, pkt_hdr_write() returns an error but the pending slot is left pointing at the partially initialized packet. A later write then reuses that packet, skips the header path because hdr_remaining is already zero, and reaches pkt_data_write() without backing storage installed. This can dereference data->vaddr while it is still NULL. Drop the pending packet when header initialization fails after the header has been fully consumed, so the next write starts from a fresh packet. Fixes: 1ed30397c0b9 ("drm/xe/pf: Add support for encap/decap of bitstream to/from packet") Signed-off-by: Guangshuo Li --- drivers/gpu/drm/xe/xe_sriov_packet.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_sriov_packet.c b/drivers/gpu/drm/xe/xe_sriov_packet.c index 2ae9eff2a7c0..e9c92019862e 100644 --- a/drivers/gpu/drm/xe/xe_sriov_packet.c +++ b/drivers/gpu/drm/xe/xe_sriov_packet.c @@ -323,8 +323,9 @@ ssize_t xe_sriov_packet_write_single(struct xe_device *xe, unsigned int vfid, const char __user *buf, size_t len) { struct xe_sriov_packet **data = pf_pick_pending(xe, vfid); - int ret; ssize_t copied; + bool writing_hdr; + int ret; if (IS_ERR_OR_NULL(*data)) { *data = xe_sriov_packet_alloc(xe); @@ -332,11 +333,21 @@ ssize_t xe_sriov_packet_write_single(struct xe_device *xe, unsigned int vfid, return -ENOMEM; } - if ((*data)->hdr_remaining) + writing_hdr = (*data)->hdr_remaining; + if (writing_hdr) copied = pkt_hdr_write(*data, buf, len); else copied = pkt_data_write(*data, buf, len); + if (copied < 0) { + if (writing_hdr && !(*data)->hdr_remaining) { + kfree(*data); + *data = NULL; + } + + rturn copied; + } + if ((*data)->hdr_remaining == 0 && (*data)->remaining == 0) { ret = xe_sriov_pf_migration_restore_produce(xe, vfid, *data); if (ret) { -- 2.43.0