[INTERDIFF TEST] Test interdiff rework

[kerneltoast]

No description provided.

[github-actions]

🔍 Interdiff Analysis

• ⚠️ PR commit fa29583e02d9 (drm/atomic: Fix potential use-after-free in nonblocking commits) → upstream 4e076c73e4f6
  Differences found:

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -135,6 +135,6 @@
 	if (!state->planes)
 		goto fail;
 
 	state->dev = dev;
 
-	DRM_DEBUG_ATOMIC("Allocated atomic state %p\n", state);
+	drm_dbg_atomic(dev, "Allocated atomic state %p\n", state);

• ⚠️ PR commit 62f986c20467 (smb: client: fix potential OOB in smb2_dump_detail()) → upstream 567320c46a60
  Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/fs/cifs/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -327,10 +327,8 @@
 	cifs_server_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",
 		 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,
 		 shdr->ProcessId);
-	if (!server->ops->check_message(buf, server->total_read, server)) {
-		cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
-				server->ops->calc_smb_size(buf, server));
-	}
+	cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
+		 server->ops->calc_smb_size(buf, server));
 #endif
 }
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/fs/cifs/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -403,8 +403,10 @@
 	cifs_server_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",
 		 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,
 		 shdr->Id.SyncId.ProcessId);
-	cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
-		 server->ops->calc_smb_size(buf));
+	if (!server->ops->check_message(buf, server->total_read, server)) {
+		cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
+				server->ops->calc_smb_size(buf));
+	}
 #endif
 }
 

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/cifs/smb2misc.c
+++ b/fs/smb/client/smb2misc.c
@@ -203,4 +210,4 @@
 
 	if (smb2_rsp_struct_sizes[command] != pdu->StructureSize2) {
 		if (command != SMB2_OPLOCK_BREAK_HE && (shdr->Status == 0 ||
-		    pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2)) {
+		    pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2_LE)) {
--- b/fs/cifs/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -324,8 +324,8 @@
 	cifs_server_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",
 		 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,
-		 shdr->ProcessId);
+		 shdr->Id.SyncId.ProcessId);
 	cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
-		 server->ops->calc_smb_size(buf, server));
+		 server->ops->calc_smb_size(buf));
 #endif
 }

• ⚠️ PR commit 7b81b3b83294 (cifs: fix oops during encryption) → upstream f7f291e14dde
  Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -32,7 +32,6 @@
 #include <linux/scatterlist.h>
 #include <uapi/linux/cifs/cifs_mount.h>
 #include "smb2pdu.h"
-#include "smb2glob.h"
 
 #define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
 
--- b/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4338,7 +4353,11 @@
 	if (!rc && enc)
 		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
 
-	kfree_sensitive(creq);
+	kfree(iv);
+free_sg:
+	kfree(sg);
+free_req:
+	kfree(req);
 	return rc;
 }
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4374,21 +4385,6 @@
 		crypt_len += SMB2_SIGNATURE_SIZE;
 	}
 
-	sg = init_sg(num_rqst, rqst, sign);
-	if (!sg) {
-		cifs_server_dbg(VFS, "%s: Failed to init sg\n", __func__);
-		rc = -ENOMEM;
-		goto free_req;
-	}
-
-	iv_len = crypto_aead_ivsize(tfm);
-	iv = kzalloc(iv_len, GFP_KERNEL);
-	if (!iv) {
-		cifs_server_dbg(VFS, "%s: Failed to alloc iv\n", __func__);
-		rc = -ENOMEM;
-		goto free_sg;
-	}
-
 	if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
 	    (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
 		memcpy(iv, (char *)tr_hdr->Nonce, SMB3_AES_GCM_NONCE);
@@ -4410,11 +4407,7 @@
 	if (!rc && enc)
 		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
 
-	kfree_sensitive(iv);
-free_sg:
-	kfree_sensitive(sg);
-free_req:
-	kfree_sensitive(req);
+	kfree_sensitive(creq);
 	return rc;
 }
 

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1956,4 +2137,4 @@
-		tcon->share_flags & (SHI1005_FLAGS_DFS | SHI1005_FLAGS_DFS_ROOT);
+	dst->FileNameLength = src->FileNameLength;
 }
 
 #endif	/* _CIFS_GLOB_H */
--- b/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -592,5 +592,5 @@
-		    struct sdesc **sdesc);
-void cifs_free_hash(struct crypto_shash **shash, struct sdesc **sdesc);
+int cifs_alloc_hash(const char *name, struct shash_desc **sdesc);
+void cifs_free_hash(struct shash_desc **sdesc);
 
 extern void rqst_page_get_length(struct smb_rqst *rqst, unsigned int page,
 				unsigned int *len, unsigned int *offset);
--- b/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4254,5 +4307,5 @@
 	u8 sign[SMB2_SIGNATURE_SIZE] = {};
-	u8 key[SMB3_SIGN_KEY_SIZE];
+	u8 key[SMB3_ENC_DEC_KEY_SIZE];
 	struct aead_request *req;
 	char *iv;
 	unsigned int iv_len;
@@ -4265,3 +4322,3 @@
 
-	rc = smb2_get_enc_key(server, tr_hdr->SessionId, enc, key);
+	rc = smb2_get_enc_key(server, le64_to_cpu(tr_hdr->SessionId), enc, key);
 	if (rc) {
@@ -4324,11 +4381,11 @@
 	if (!rc && enc)
 		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
 
-	kfree(iv);
+	kfree_sensitive(iv);
 free_sg:
-	kfree(sg);
+	kfree_sensitive(sg);
 free_req:
-	kfree(req);
+	kfree_sensitive(req);
 	return rc;
 }

• ⚠️ PR commit fbd5b235c5a9 (cifs: Remove duplicated include in cifsglob.h) → upstream d74f4a3f6d88
  Differences found:

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -24,2 +24,3 @@
 #include <uapi/linux/cifs/cifs_mount.h>
+#include "../smbfs_common/smb2pdu.h"
 #include "smb2pdu.h"

This is an automated interdiff check for backported commits.

[github-actions]

JIRA PR Check Results

5 commit(s) with issues found:

Commit fbd5b235c5a9

Summary: cifs: Remove duplicated include in cifsglob.h

❌ Errors:

• VULN-154751: Status is 'Publish CSAF', expected 'In Progress'
• VULN-154751: LTS product 'lts-8.6' expects branch 'ciqlts8_6', but merge target is 'test-ciqlts8_6'

Commit 7b81b3b83294

Summary: cifs: fix oops during encryption

❌ Errors:

• VULN-154751: Status is 'Publish CSAF', expected 'In Progress'
• VULN-154751: LTS product 'lts-8.6' expects branch 'ciqlts8_6', but merge target is 'test-ciqlts8_6'

Commit 62f986c20467

Summary: smb: client: fix potential OOB in smb2_dump_detail()

❌ Errors:

• VULN-4131: Status is 'Publish CSAF', expected 'In Progress'
• VULN-4131: LTS product 'lts-8.6' expects branch 'ciqlts8_6', but merge target is 'test-ciqlts8_6'

Commit a610ea5d0355

Summary: smb: client: fix OOB in smbCalcSize()

❌ Errors:

• VULN-4230: Status is 'Publish CSAF', expected 'In Progress'
• VULN-4230: LTS product 'lts-8.6' expects branch 'ciqlts8_6', but merge target is 'test-ciqlts8_6'

Commit fa29583e02d9

Summary: drm/atomic: Fix potential use-after-free in nonblocking commits

❌ Errors:

• VULN-4246: Status is 'Publish CSAF', expected 'In Progress'
• VULN-4246: LTS product 'lts-8.6' expects branch 'ciqlts8_6', but merge target is 'test-ciqlts8_6'

---

Summary: Checked 5 commit(s) total.

[github-actions]

⚠️ This PR contains VULN tickets that do not match the target LTS product. Please review the JIRA ticket assignments and ensure they match the merge target branch.

[github-actions]

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/21922695100