diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/rds/message.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/rds/message.c')
| -rw-r--r-- | net/rds/message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/message.c b/net/rds/message.c index ca50a8ec9742..9a1d67e001ba 100644 --- a/net/rds/message.c +++ b/net/rds/message.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include "rds.h" | 36 | #include "rds.h" |
| 36 | #include "rdma.h" | 37 | #include "rdma.h" |
| @@ -122,8 +123,7 @@ int rds_message_add_extension(struct rds_header *hdr, | |||
| 122 | if (hdr->h_exthdr[0] != RDS_EXTHDR_NONE) | 123 | if (hdr->h_exthdr[0] != RDS_EXTHDR_NONE) |
| 123 | return 0; | 124 | return 0; |
| 124 | 125 | ||
| 125 | if (type >= __RDS_EXTHDR_MAX | 126 | if (type >= __RDS_EXTHDR_MAX || len != rds_exthdr_size[type]) |
| 126 | || len != rds_exthdr_size[type]) | ||
| 127 | return 0; | 127 | return 0; |
| 128 | 128 | ||
| 129 | if (ext_len >= RDS_HEADER_EXT_SPACE) | 129 | if (ext_len >= RDS_HEADER_EXT_SPACE) |