sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

pytalloc: ensure talloc_ctx is directly after PyObject_HEAD

Browse Source 
the talloc python interface for tp_alloc and tp_dealloc relies on a
cast to a py_talloc_Object to find the talloc_ctx (see
py_talloc_dealloc). This means we rely on the talloc_ctx for the
object being directly after the PyObject_HEAD

This fixes the talloc free with references bug in samba_dnsupdate

The actual problem was the tp_alloc() call in
PyCredentialCacheContainer_from_ccache_container() which used a cast
from a py_talloc_Object to a PyCredentialCacheContainerObject. That
case effectively changed the parent/child relationship between the
talloc_ctx and the ccc ptr.

This patch changes all the structures that follow this pattern to put
the TALLOC_CTX directly after the PyObject_HEAD, to ensure that if
anyone else decides to do a dangerous cast like this that it won't
cause the same sort of subtle breakage.

Pair-Programmed-With: Rusty Russell <rusty@samba.org>
This commit is contained in:
Andrew Tridgell 2010-04-20 15:33:00 +10:00
parent 45be1c7ba4
commit f1c523939b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/auth/credentials/pycredentials.h
View File

@ -26,8 +26,8 @@ PyAPI_DATA(PyTypeObject) PyCredentials;
PyAPI_DATA(PyTypeObject) PyCredentialCacheContainer; PyAPI_DATA(PyTypeObject) PyCredentialCacheContainer;
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ccache_container *ccc;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ccache_container *ccc;
} PyCredentialCacheContainerObject; } PyCredentialCacheContainerObject;
#define PyCredentials_Check(py_obj) PyObject_TypeCheck(py_obj, &PyCredentials) #define PyCredentials_Check(py_obj) PyObject_TypeCheck(py_obj, &PyCredentials)
#define PyCredentials_AsCliCredentials(py_obj) py_talloc_get_type(py_obj, struct cli_credentials) #define PyCredentials_AsCliCredentials(py_obj) py_talloc_get_type(py_obj, struct cli_credentials)

12
source4/lib/ldb/pyldb.h
View File

@ -31,8 +31,8 @@
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_context *ldb_ctx;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_context *ldb_ctx;
} PyLdbObject; } PyLdbObject;
#define PyLdb_AsLdbContext(pyobj) ((PyLdbObject *)pyobj)->ldb_ctx #define PyLdb_AsLdbContext(pyobj) ((PyLdbObject *)pyobj)->ldb_ctx
@ -40,8 +40,8 @@ typedef struct {
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_dn *dn;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_dn *dn;
} PyLdbDnObject; } PyLdbDnObject;
PyObject *PyLdbDn_FromDn(struct ldb_dn *); PyObject *PyLdbDn_FromDn(struct ldb_dn *);
@ -51,16 +51,16 @@ bool PyObject_AsDn(TALLOC_CTX *mem_ctx, PyObject *object, struct ldb_context *ld
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_message *msg;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_message *msg;
} PyLdbMessageObject; } PyLdbMessageObject;
#define PyLdbMessage_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessage) #define PyLdbMessage_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessage)
#define PyLdbMessage_AsMessage(pyobj) ((PyLdbMessageObject *)pyobj)->msg #define PyLdbMessage_AsMessage(pyobj) ((PyLdbMessageObject *)pyobj)->msg
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_module *mod;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_module *mod;
} PyLdbModuleObject; } PyLdbModuleObject;
PyObject *PyLdbMessage_FromMessage(struct ldb_message *message); PyObject *PyLdbMessage_FromMessage(struct ldb_message *message);
PyObject *PyLdbModule_FromModule(struct ldb_module *mod); PyObject *PyLdbModule_FromModule(struct ldb_module *mod);
@ -68,8 +68,8 @@ PyObject *PyLdbModule_FromModule(struct ldb_module *mod);
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_message_element *el;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_message_element *el;
} PyLdbMessageElementObject; } PyLdbMessageElementObject;
struct ldb_message_element *PyObject_AsMessageElement(TALLOC_CTX *mem_ctx, PyObject *obj, int flags, const char *name); struct ldb_message_element *PyObject_AsMessageElement(TALLOC_CTX *mem_ctx, PyObject *obj, int flags, const char *name);
PyObject *PyLdbMessageElement_FromMessageElement(struct ldb_message_element *, TALLOC_CTX *mem_ctx); PyObject *PyLdbMessageElement_FromMessageElement(struct ldb_message_element *, TALLOC_CTX *mem_ctx);
@ -78,8 +78,8 @@ PyObject *PyLdbMessageElement_FromMessageElement(struct ldb_message_element *, T
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct ldb_parse_tree *tree;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct ldb_parse_tree *tree;
} PyLdbTreeObject; } PyLdbTreeObject;
PyObject *PyLdbTree_FromTree(struct ldb_parse_tree *); PyObject *PyLdbTree_FromTree(struct ldb_parse_tree *);
#define PyLdbTree_AsTree(pyobj) ((PyLdbTreeObject *)pyobj)->tree #define PyLdbTree_AsTree(pyobj) ((PyLdbTreeObject *)pyobj)->tree

4
source4/lib/messaging/pymessaging.c
View File

@ -303,10 +303,10 @@ PyTypeObject messaging_Type = {
*/ */
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
TALLOC_CTX *mem_ctx;
const char *server_name; const char *server_name;
struct server_id *dest_ids; struct server_id *dest_ids;
struct messaging_context *msg_ctx; struct messaging_context *msg_ctx;
TALLOC_CTX *mem_ctx;
} irpc_ClientConnectionObject; } irpc_ClientConnectionObject;
/* /*
@ -382,10 +382,10 @@ PyObject *py_irpc_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
TALLOC_CTX *mem_ctx;
struct irpc_request **reqs; struct irpc_request **reqs;
int count; int count;
int current; int current;
TALLOC_CTX *mem_ctx;
py_data_unpack_fn unpack_fn; py_data_unpack_fn unpack_fn;
} irpc_ResultObject; } irpc_ResultObject;

2
source4/libnet/py_net.c
View File

@ -29,8 +29,8 @@
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct libnet_context *libnet_ctx;
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct libnet_context *libnet_ctx;
struct tevent_context *ev; struct tevent_context *ev;
} py_net_Object; } py_net_Object;