sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

CVE-2023-3347: smbd: pass lp_ctx to smb[1|2]_srv_init_signing()

Browse Source 
No change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15397

Signed-off-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Ralph Boehme 2023-06-21 15:06:12 +02:00 committed by Jule Anger
parent e67b7e5f88
commit e96d5002fc
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/smbd/proto.h
View File

@ -52,7 +52,8 @@ struct dcesrv_context;
/* The following definitions come from smbd/smb2_signing.c */
bool smb2_srv_init_signing(struct smbXsrv_connection *conn);
bool smb2_srv_init_signing(struct loadparm_context *lp_ctx,
struct smbXsrv_connection *conn);
bool srv_init_signing(struct smbXsrv_connection *conn);
/* The following definitions come from smbd/aio.c */

10
source3/smbd/smb1_signing.c
View File

@ -170,18 +170,13 @@ static void smbd_shm_signing_free(TALLOC_CTX *mem_ctx, void *ptr)
Called by server negprot when signing has been negotiated.
************************************************************/
bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
bool smb1_srv_init_signing(struct loadparm_context *lp_ctx,
struct smbXsrv_connection *conn)
{
bool allowed = true;
bool desired;
bool mandatory = false;
struct loadparm_context *lp_ctx = loadparm_init_s3(conn, loadparm_s3_helpers());
if (lp_ctx == NULL) {
DEBUG(10, ("loadparm_init_s3 failed\n"));
return false;
}
/*
* if the client and server allow signing,
* we desire to use it.
@ -195,7 +190,6 @@ bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
*/
desired = lpcfg_server_signing_allowed(lp_ctx, &mandatory);
talloc_unlink(conn, lp_ctx);
if (lp_async_smb_echo_handler()) {
struct smbd_shm_signing *s;

3
source3/smbd/smb1_signing.h
View File

@ -33,4 +33,5 @@ bool smb1_srv_is_signing_negotiated(struct smbXsrv_connection *conn);
void smb1_srv_set_signing(struct smbXsrv_connection *conn,
const DATA_BLOB user_session_key,
const DATA_BLOB response);
bool smb1_srv_init_signing(struct smbXsrv_connection *conn);
bool smb1_srv_init_signing(struct loadparm_context *lp_ctx,
struct smbXsrv_connection *conn);

25
source3/smbd/smb2_signing.c
View File

@ -26,32 +26,37 @@
#include "lib/param/param.h"
#include "smb2_signing.h"
bool smb2_srv_init_signing(struct smbXsrv_connection *conn)
bool smb2_srv_init_signing(struct loadparm_context *lp_ctx,
struct smbXsrv_connection *conn)
{
struct loadparm_context *lp_ctx = loadparm_init_s3(conn, loadparm_s3_helpers());
if (lp_ctx == NULL) {
DBG_DEBUG("loadparm_init_s3 failed\n");
return false;
}
/*
* For SMB2 all we need to know is if signing is mandatory.
* It is always allowed and desired, whatever the smb.conf says.
*/
(void)lpcfg_server_signing_allowed(lp_ctx, &conn->smb2.signing_mandatory);
talloc_unlink(conn, lp_ctx);
return true;
}
bool srv_init_signing(struct smbXsrv_connection *conn)
{
struct loadparm_context *lp_ctx = NULL;
bool ok;
lp_ctx = loadparm_init_s3(conn, loadparm_s3_helpers());
if (lp_ctx == NULL) {
DBG_DEBUG("loadparm_init_s3 failed\n");
return false;
}
#if defined(WITH_SMB1SERVER)
if (conn->protocol >= PROTOCOL_SMB2_02) {
#endif
return smb2_srv_init_signing(conn);
ok = smb2_srv_init_signing(lp_ctx, conn);
#if defined(WITH_SMB1SERVER)
} else {
return smb1_srv_init_signing(conn);
ok = smb1_srv_init_signing(lp_ctx, conn);
}
#endif
talloc_unlink(conn, lp_ctx);
return ok;
}