Attachment 18066 Details for Bug 15426 – git-am fix for 4.19.next

[patch] git-am fix for 4.19.next

bug-15426-4.19.patch (text/plain), 1.05 KB, created by Jeremy Allison on 2023-08-24 16:10:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2023-08-24 16:10:38 UTC

Size: 1.05 KB

patch

obsolete

>From 5b7b1ed757b422b570b48be643a3dbab80042cf8 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 16 Aug 2023 17:24:37 -0700
>Subject: [PATCH] s3: libsmb: Add a missing return statement in the timeout
> case.
>
>Obvious fix (needs a malicious server to recreate).
>
>Found by Robert Morris <rtm@lcs.mit.edu>
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15426
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit d27c2f2a47dc488ee32dd28d01697bfc409dff77)
>---
> source3/libsmb/clidfs.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
>index 4321c216473..6696ed3ea05 100644
>--- a/source3/libsmb/clidfs.c
>+++ b/source3/libsmb/clidfs.c
>@@ -202,6 +202,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
> 			 c->timeout,
> 			 smbXcli_conn_remote_name(c->conn));
> 		cli_shutdown(c);
>+		return status;
> 	} else if (!NT_STATUS_IS_OK(status)) {
> 		d_printf("Protocol negotiation to server %s (for a protocol between %s and %s) failed: %s\n",
> 			 smbXcli_conn_remote_name(c->conn),
>-- 
>2.34.1
>

Flags:

asn: review+
slow: review+

Actions: View

Attachments on bug 15426: 17990 | 18066