-
-
Notifications
You must be signed in to change notification settings - Fork 31.8k
gh-133009: fix UAF in xml.etree.ElementTree.Element.__deepcopy__
#133010
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
2b5be5f
721481d
cef5146
8297c8a
7f8ed28
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
:mod:`xml.etree.ElementTree`: Fix a crash in :meth:`Element.__deepcopy__ | ||
<object.__deepcopy__>` when the element is concurrently mutated. | ||
Patch by Bénédikt Tran. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -805,6 +805,7 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo) | |
{ | ||
Py_ssize_t i; | ||
ElementObject* element; | ||
PyObject* tmp; | ||
PyObject* tag; | ||
PyObject* attrib; | ||
PyObject* text; | ||
|
@@ -813,12 +814,16 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo) | |
|
||
PyTypeObject *tp = Py_TYPE(self); | ||
elementtreestate *st = get_elementtree_state_by_type(tp); | ||
tag = deepcopy(st, self->tag, memo); | ||
tmp = Py_NewRef(self->tag); | ||
tag = deepcopy(st, tmp, memo); | ||
Py_CLEAR(tmp); | ||
if (!tag) | ||
return NULL; | ||
|
||
if (self->extra && self->extra->attrib) { | ||
attrib = deepcopy(st, self->extra->attrib, memo); | ||
tmp = Py_NewRef(self->extra->attrib); | ||
attrib = deepcopy(st, tmp, memo); | ||
Py_CLEAR(tmp); | ||
if (!attrib) { | ||
Py_DECREF(tag); | ||
return NULL; | ||
|
@@ -835,12 +840,16 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo) | |
if (!element) | ||
return NULL; | ||
|
||
text = deepcopy(st, JOIN_OBJ(self->text), memo); | ||
tmp = Py_NewRef(JOIN_OBJ(self->text)); | ||
text = deepcopy(st, tmp, memo); | ||
Py_CLEAR(tmp); | ||
if (!text) | ||
goto error; | ||
_set_joined_ptr(&element->text, JOIN_SET(text, JOIN_GET(self->text))); | ||
|
||
tail = deepcopy(st, JOIN_OBJ(self->tail), memo); | ||
tmp = Py_NewRef(JOIN_OBJ(self->tail)); | ||
tail = deepcopy(st, tmp, memo); | ||
Py_CLEAR(tmp); | ||
if (!tail) | ||
goto error; | ||
_set_joined_ptr(&element->tail, JOIN_SET(tail, JOIN_GET(self->tail))); | ||
|
@@ -850,9 +859,10 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo) | |
if (element_resize(element, self->extra->length) < 0) | ||
goto error; | ||
|
||
// TODO(picnixz): check for an evil child's __deepcopy__ on 'self' | ||
for (i = 0; i < self->extra->length; i++) { | ||
PyObject* child = deepcopy(st, self->extra->children[i], memo); | ||
for (i = 0; self->extra && i < self->extra->length; i++) { | ||
tmp = Py_NewRef(self->extra->children[i]); | ||
PyObject* child = deepcopy(st, tmp, memo); | ||
Py_CLEAR(tmp); | ||
if (!child || !Element_Check(st, child)) { | ||
if (child) { | ||
raise_type_error(child); | ||
|
@@ -865,7 +875,12 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo) | |
} | ||
|
||
assert(!element->extra->length); | ||
element->extra->length = self->extra->length; | ||
/* | ||
* The original 'self->extra' may be gone at this point if deepcopy() | ||
* had side-effects. However, 'i' is the number of copied items that | ||
* we were able to successfully copy. | ||
*/ | ||
element->extra->length = i; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not directly related but the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh I don't know. I'm leaving on Monday evening for ~10 days. Maybe we can track the issue separately? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes definitely a separate issue! Just noticed it while reading code around your change. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the refcnt > 1, we need to check in memo, and use a reference to already made copy if it is found. We need also to update memo. It is complicated and adds a lot of overhead. |
||
} | ||
|
||
/* add object to memo dictionary (so deepcopy won't visit it again) */ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will kill the optimization in
deepcopy()
. Only increment the refcount after checking the fast path.