diff options
| author | Raghavendra G <rgowdapp@redhat.com> | 2016-05-06 12:26:29 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2016-08-27 04:10:42 -0700 |
| commit | 6b406ac42f55233df474fa304dbb9e6fc447bd8f (patch) | |
| tree | d4bd0fb066871bd210c0aa836778f7da180580b0 /xlators | |
| parent | 50fa85c071553b41f33a8167b31c8a9b54cfe3e3 (diff) | |
quotad: fix potential buffer overflows
This converts sprintf to gf_asprintf in following components: * quotad.c
* dht
* afr
* protocol/client
* rpc/rpc-lib
* rpc/rpc-transport
This is a backport of http://review.gluster.org/#/c/14102/
> Change-Id: If8a267bab3d91003bdef3a92664077a0136745ee
> BUG: 1332073
> Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
> Reviewed-on: http://review.gluster.org/14102
> Tested-by: Manikandan Selvaganesh <mselvaga@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Change-Id: If8a267bab3d91003bdef3a92664077a0136745ee
BUG: 1366746
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-on: http://review.gluster.org/15325
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: Manikandan Selvaganesh <mselvaga@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-helper.c | 18 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-messages.h | 9 |
2 files changed, 23 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 590d0043507..255c0823aac 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -353,17 +353,29 @@ out: static xlator_t * dht_get_subvol_from_id(xlator_t *this, int client_id) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; dht_conf_t *conf = NULL; - char sid[6] = { 0 }; + char *sid = NULL; + int32_t ret = -1; conf = this->private; - sprintf(sid, "%d", client_id); + ret = gf_asprintf(&sid, "%d", client_id); + if (ret == -1) { + gf_msg (this->name, GF_LOG_ERROR, 0, + DHT_MSG_ASPRINTF_FAILED, "asprintf failed while " + "fetching subvol from the id"); + goto out; + } + if (dict_get_ptr(conf->leaf_to_subvol, sid, (void **) &xl)) xl = NULL; + GF_FREE (sid); + +out: return xl; + } int diff --git a/xlators/cluster/dht/src/dht-messages.h b/xlators/cluster/dht/src/dht-messages.h index 8c0b9103df1..153f4de0458 100644 --- a/xlators/cluster/dht/src/dht-messages.h +++ b/xlators/cluster/dht/src/dht-messages.h @@ -40,7 +40,7 @@ */ #define GLFS_DHT_BASE GLFS_MSGID_COMP_DHT -#define GLFS_DHT_NUM_MESSAGES 116 +#define GLFS_DHT_NUM_MESSAGES 117 #define GLFS_MSGID_END (GLFS_DHT_BASE + GLFS_DHT_NUM_MESSAGES + 1) /* Messages with message IDs */ @@ -1071,5 +1071,12 @@ */ #define DHT_MSG_LOCK_INODE_UNREF_FAILED (GLFS_DHT_BASE + 116) +/* + * @messageid 109116 + * @diagnosis + * @recommendedaction None + */ +#define DHT_MSG_ASPRINTF_FAILED (GLFS_DHT_BASE + 117) + #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* _DHT_MESSAGES_H_ */ |