Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ofpbuf: Update msg when resizing ofpbuf.
Commit 6fd6ed7 (ofpbuf: Simplify ofpbuf API.) introduced the 'header' and 'msg' pointers to 'struct ofpbuf'. However, we forget to update the 'msg' pointer when resizing ofpbuf. This bug could cause serious issue. For example, in the function ofputil_encode_nx_packet_in(), the 'msg' pointer is populated in ofpraw_alloc_xid() when creating the ofpbuf . Later, the ofpbuf memory can be reallocated due to the writing to the ofpbuf. However, since the 'msg' pointer is not updated, the later use of the 'ofpbuf->msg' will end up writing to either free'ed memory or memory allocated for other struct. This commit fixes the bug by always updating the 'header' and 'msg' pointers when the ofpbuf is resized. Also, a simple test is added. Signed-off-by: Alex Wang <alexw@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
- Loading branch information
Showing
6 changed files
with
98 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,6 +29,7 @@ | |
/test-multipath | ||
/test-netflow | ||
/test-odp | ||
/test-ofpbuf | ||
/test-ovsdb | ||
/test-packets | ||
/test-random | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Copyright (c) 2015 Nicira, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at: | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include <config.h> | ||
#undef NDEBUG | ||
#include <stdio.h> | ||
#include "ofpbuf.h" | ||
#include "ovstest.h" | ||
#include "util.h" | ||
|
||
#define BUF_SIZE 100 | ||
#define HDR_OFS 10 | ||
#define MSG_OFS 50 | ||
|
||
static void | ||
test_ofpbuf_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) | ||
{ | ||
struct ofpbuf *buf = ofpbuf_new(BUF_SIZE); | ||
int exit_code = 0; | ||
|
||
/* Init checks. */ | ||
ovs_assert(!buf->size); | ||
ovs_assert(buf->allocated == BUF_SIZE); | ||
ovs_assert(buf->base == buf->data); | ||
|
||
/* Sets 'buf->header' and 'buf->msg'. */ | ||
buf->header = (char *) buf->base + HDR_OFS; | ||
buf->msg = (char *) buf->base + MSG_OFS; | ||
|
||
/* Gets another 'BUF_SIZE' bytes headroom. */ | ||
ofpbuf_prealloc_headroom(buf, BUF_SIZE); | ||
ovs_assert(!buf->size); | ||
ovs_assert(buf->allocated == 2 * BUF_SIZE); | ||
ovs_assert((char *) buf->base + BUF_SIZE == buf->data); | ||
/* Now 'buf->header' and 'buf->msg' must be BUF_SIZE away from | ||
* their original offsets. */ | ||
ovs_assert(buf->header == (char *) buf->base + BUF_SIZE + HDR_OFS); | ||
ovs_assert(buf->msg == (char *) buf->base + BUF_SIZE + MSG_OFS); | ||
|
||
/* Gets another 'BUF_SIZE' bytes tailroom. */ | ||
ofpbuf_prealloc_tailroom(buf, BUF_SIZE); | ||
/* Must remain unchanged. */ | ||
ovs_assert(!buf->size); | ||
ovs_assert(buf->allocated == 2 * BUF_SIZE); | ||
ovs_assert((char *) buf->base + BUF_SIZE == buf->data); | ||
ovs_assert(buf->header == (char *) buf->base + BUF_SIZE + HDR_OFS); | ||
ovs_assert(buf->msg == (char *) buf->base + BUF_SIZE + MSG_OFS); | ||
|
||
ofpbuf_delete(buf); | ||
exit(exit_code); | ||
} | ||
|
||
OVSTEST_REGISTER("test-ofpbuf", test_ofpbuf_main); |