d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/vm_power: fix max length of unix socket path

Browse Source 
The length of the path to a unix socket is not PATH_MAX but instead is
UNIX_PATH_MAX which is generally just over 100 bytes in size. It's not
actually defined in sys/un.h on linux - despite the man page referencing
it, so calculate the size in the case where it's not defined.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2014-12-16 15:03:51 +00:00 committed by Thomas Monjalon
parent 95df1d78c6
commit 0d74597c1b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/vm_power_manager/channel_manager.c
View File

@ -597,7 +597,7 @@ get_info_vm(const char *vm_name, struct vm_info *info)
ITERATIVE_BITMASK_CHECK_64(mask, i) {
info->channels[channel_num].channel_num = i;
memcpy(info->channels[channel_num].channel_path,
vm_info->channels[i]->channel_path, PATH_MAX);
vm_info->channels[i]->channel_path, UNIX_PATH_MAX);
info->channels[channel_num].status = vm_info->channels[i]->status;
info->channels[channel_num].fd = vm_info->channels[i]->fd;
channel_num++;

8
examples/vm_power_manager/channel_manager.h
View File

@ -39,6 +39,7 @@ extern "C" {
#endif
#include <linux/limits.h>
#include <sys/un.h>
#include <rte_atomic.h>
#include "channel_commands.h"
@ -54,6 +55,11 @@ extern "C" {
/* File socket directory */
#define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/"
#ifndef UNIX_PATH_MAX
struct sockaddr_un _sockaddr_un;
#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
#endif
/* Communication Channel Status */
enum channel_status { CHANNEL_MGR_CHANNEL_DISCONNECTED = 0,
CHANNEL_MGR_CHANNEL_CONNECTED,
@ -68,7 +74,7 @@ enum vm_status { CHANNEL_MGR_VM_INACTIVE = 0, CHANNEL_MGR_VM_ACTIVE};
* the host.
*/
struct channel_info {
char channel_path[PATH_MAX]; /**< Path to host socket */
char channel_path[UNIX_PATH_MAX]; /**< Path to host socket */
volatile uint32_t status; /**< Connection status(enum channel_status) */
int fd; /**< AF_UNIX socket fd */
unsigned channel_num; /**< CHANNEL_MGR_SOCKET_PATH/<vm_name>.channel_num */