Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame^] | 1 | libxml2-2.9.4: Fix CVE-2016-4658 |
| 2 | |
| 3 | [No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-4658 |
| 4 | |
| 5 | xpointer: Disallow namespace nodes in XPointer points and ranges |
| 6 | |
| 7 | Namespace nodes must be copied to avoid use-after-free errors. |
| 8 | But they don't necessarily have a physical representation in a |
| 9 | document, so simply disallow them in XPointer ranges. |
| 10 | |
| 11 | Upstream-Status: Backported |
| 12 | - [https://git.gnome.org/browse/libxml2/commit/?id=c1d1f7121194036608bf555f08d3062a36fd344b] |
| 13 | - [https://git.gnome.org/browse/libxml2/commit/?id=3f8a91036d338e51c059d54397a42d645f019c65] |
| 14 | CVE: CVE-2016-4658 |
| 15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
| 16 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> |
| 17 | |
| 18 | diff --git a/xpointer.c b/xpointer.c |
| 19 | index 676c510..911680d 100644 |
| 20 | --- a/xpointer.c |
| 21 | +++ b/xpointer.c |
| 22 | @@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) { |
| 23 | } |
| 24 | |
| 25 | /** |
| 26 | + * xmlXPtrNewRangeInternal: |
| 27 | + * @start: the starting node |
| 28 | + * @startindex: the start index |
| 29 | + * @end: the ending point |
| 30 | + * @endindex: the ending index |
| 31 | + * |
| 32 | + * Internal function to create a new xmlXPathObjectPtr of type range |
| 33 | + * |
| 34 | + * Returns the newly created object. |
| 35 | + */ |
| 36 | +static xmlXPathObjectPtr |
| 37 | +xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex, |
| 38 | + xmlNodePtr end, int endindex) { |
| 39 | + xmlXPathObjectPtr ret; |
| 40 | + |
| 41 | + /* |
| 42 | + * Namespace nodes must be copied (see xmlXPathNodeSetDupNs). |
| 43 | + * Disallow them for now. |
| 44 | + */ |
| 45 | + if ((start != NULL) && (start->type == XML_NAMESPACE_DECL)) |
| 46 | + return(NULL); |
| 47 | + if ((end != NULL) && (end->type == XML_NAMESPACE_DECL)) |
| 48 | + return(NULL); |
| 49 | + |
| 50 | + ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 51 | + if (ret == NULL) { |
| 52 | + xmlXPtrErrMemory("allocating range"); |
| 53 | + return(NULL); |
| 54 | + } |
| 55 | + memset(ret, 0, sizeof(xmlXPathObject)); |
| 56 | + ret->type = XPATH_RANGE; |
| 57 | + ret->user = start; |
| 58 | + ret->index = startindex; |
| 59 | + ret->user2 = end; |
| 60 | + ret->index2 = endindex; |
| 61 | + return(ret); |
| 62 | +} |
| 63 | + |
| 64 | +/** |
| 65 | * xmlXPtrNewRange: |
| 66 | * @start: the starting node |
| 67 | * @startindex: the start index |
| 68 | @@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex, |
| 69 | if (endindex < 0) |
| 70 | return(NULL); |
| 71 | |
| 72 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 73 | - if (ret == NULL) { |
| 74 | - xmlXPtrErrMemory("allocating range"); |
| 75 | - return(NULL); |
| 76 | - } |
| 77 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 78 | - ret->type = XPATH_RANGE; |
| 79 | - ret->user = start; |
| 80 | - ret->index = startindex; |
| 81 | - ret->user2 = end; |
| 82 | - ret->index2 = endindex; |
| 83 | + ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex); |
| 84 | xmlXPtrRangeCheckOrder(ret); |
| 85 | return(ret); |
| 86 | } |
| 87 | @@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) { |
| 88 | if (end->type != XPATH_POINT) |
| 89 | return(NULL); |
| 90 | |
| 91 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 92 | - if (ret == NULL) { |
| 93 | - xmlXPtrErrMemory("allocating range"); |
| 94 | - return(NULL); |
| 95 | - } |
| 96 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 97 | - ret->type = XPATH_RANGE; |
| 98 | - ret->user = start->user; |
| 99 | - ret->index = start->index; |
| 100 | - ret->user2 = end->user; |
| 101 | - ret->index2 = end->index; |
| 102 | + ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user, |
| 103 | + end->index); |
| 104 | xmlXPtrRangeCheckOrder(ret); |
| 105 | return(ret); |
| 106 | } |
| 107 | @@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) { |
| 108 | if (start->type != XPATH_POINT) |
| 109 | return(NULL); |
| 110 | |
| 111 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 112 | - if (ret == NULL) { |
| 113 | - xmlXPtrErrMemory("allocating range"); |
| 114 | - return(NULL); |
| 115 | - } |
| 116 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 117 | - ret->type = XPATH_RANGE; |
| 118 | - ret->user = start->user; |
| 119 | - ret->index = start->index; |
| 120 | - ret->user2 = end; |
| 121 | - ret->index2 = -1; |
| 122 | + ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1); |
| 123 | xmlXPtrRangeCheckOrder(ret); |
| 124 | return(ret); |
| 125 | } |
| 126 | @@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) { |
| 127 | if (end->type != XPATH_POINT) |
| 128 | return(NULL); |
| 129 | |
| 130 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 131 | - if (ret == NULL) { |
| 132 | - xmlXPtrErrMemory("allocating range"); |
| 133 | - return(NULL); |
| 134 | - } |
| 135 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 136 | - ret->type = XPATH_RANGE; |
| 137 | - ret->user = start; |
| 138 | - ret->index = -1; |
| 139 | - ret->user2 = end->user; |
| 140 | - ret->index2 = end->index; |
| 141 | + ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index); |
| 142 | xmlXPtrRangeCheckOrder(ret); |
| 143 | return(ret); |
| 144 | } |
| 145 | @@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) { |
| 146 | if (end == NULL) |
| 147 | return(NULL); |
| 148 | |
| 149 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 150 | - if (ret == NULL) { |
| 151 | - xmlXPtrErrMemory("allocating range"); |
| 152 | - return(NULL); |
| 153 | - } |
| 154 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 155 | - ret->type = XPATH_RANGE; |
| 156 | - ret->user = start; |
| 157 | - ret->index = -1; |
| 158 | - ret->user2 = end; |
| 159 | - ret->index2 = -1; |
| 160 | + ret = xmlXPtrNewRangeInternal(start, -1, end, -1); |
| 161 | xmlXPtrRangeCheckOrder(ret); |
| 162 | return(ret); |
| 163 | } |
| 164 | @@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { |
| 165 | if (start == NULL) |
| 166 | return(NULL); |
| 167 | |
| 168 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 169 | - if (ret == NULL) { |
| 170 | - xmlXPtrErrMemory("allocating range"); |
| 171 | - return(NULL); |
| 172 | - } |
| 173 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 174 | - ret->type = XPATH_RANGE; |
| 175 | - ret->user = start; |
| 176 | - ret->index = -1; |
| 177 | - ret->user2 = NULL; |
| 178 | - ret->index2 = -1; |
| 179 | + ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1); |
| 180 | return(ret); |
| 181 | } |
| 182 | |
| 183 | @@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { |
| 184 | */ |
| 185 | xmlXPathObjectPtr |
| 186 | xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { |
| 187 | + xmlNodePtr endNode; |
| 188 | + int endIndex; |
| 189 | xmlXPathObjectPtr ret; |
| 190 | |
| 191 | if (start == NULL) |
| 192 | @@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { |
| 193 | return(NULL); |
| 194 | switch (end->type) { |
| 195 | case XPATH_POINT: |
| 196 | + endNode = end->user; |
| 197 | + endIndex = end->index; |
| 198 | + break; |
| 199 | case XPATH_RANGE: |
| 200 | + endNode = end->user2; |
| 201 | + endIndex = end->index2; |
| 202 | break; |
| 203 | case XPATH_NODESET: |
| 204 | /* |
| 205 | @@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { |
| 206 | */ |
| 207 | if (end->nodesetval->nodeNr <= 0) |
| 208 | return(NULL); |
| 209 | + endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; |
| 210 | + endIndex = -1; |
| 211 | break; |
| 212 | default: |
| 213 | /* TODO */ |
| 214 | return(NULL); |
| 215 | } |
| 216 | |
| 217 | - ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); |
| 218 | - if (ret == NULL) { |
| 219 | - xmlXPtrErrMemory("allocating range"); |
| 220 | - return(NULL); |
| 221 | - } |
| 222 | - memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); |
| 223 | - ret->type = XPATH_RANGE; |
| 224 | - ret->user = start; |
| 225 | - ret->index = -1; |
| 226 | - switch (end->type) { |
| 227 | - case XPATH_POINT: |
| 228 | - ret->user2 = end->user; |
| 229 | - ret->index2 = end->index; |
| 230 | - break; |
| 231 | - case XPATH_RANGE: |
| 232 | - ret->user2 = end->user2; |
| 233 | - ret->index2 = end->index2; |
| 234 | - break; |
| 235 | - case XPATH_NODESET: { |
| 236 | - ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; |
| 237 | - ret->index2 = -1; |
| 238 | - break; |
| 239 | - } |
| 240 | - default: |
| 241 | - STRANGE |
| 242 | - return(NULL); |
| 243 | - } |
| 244 | + ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex); |
| 245 | xmlXPtrRangeCheckOrder(ret); |
| 246 | return(ret); |
| 247 | } |
| 248 | @@ -1835,8 +1798,8 @@ xmlXPtrStartPointFunction(xmlXPathParserContextPtr ctxt, int nargs) { |
| 249 | case XPATH_RANGE: { |
| 250 | xmlNodePtr node = tmp->user; |
| 251 | if (node != NULL) { |
| 252 | - if (node->type == XML_ATTRIBUTE_NODE) { |
| 253 | - /* TODO: Namespace Nodes ??? */ |
| 254 | + if ((node->type == XML_ATTRIBUTE_NODE) || |
| 255 | + (node->type == XML_NAMESPACE_DECL)) { |
| 256 | xmlXPathFreeObject(obj); |
| 257 | xmlXPtrFreeLocationSet(newset); |
| 258 | XP_ERROR(XPTR_SYNTAX_ERROR); |
| 259 | @@ -1931,8 +1894,8 @@ xmlXPtrEndPointFunction(xmlXPathParserContextPtr ctxt, int nargs) { |
| 260 | case XPATH_RANGE: { |
| 261 | xmlNodePtr node = tmp->user2; |
| 262 | if (node != NULL) { |
| 263 | - if (node->type == XML_ATTRIBUTE_NODE) { |
| 264 | - /* TODO: Namespace Nodes ??? */ |
| 265 | + if ((node->type == XML_ATTRIBUTE_NODE) || |
| 266 | + (node->type == XML_NAMESPACE_DECL)) { |
| 267 | xmlXPathFreeObject(obj); |
| 268 | xmlXPtrFreeLocationSet(newset); |
| 269 | XP_ERROR(XPTR_SYNTAX_ERROR); |