The macaddr opclass stores two macaddr structs (each of size 6) in an index column that's declared as being of type gbtreekey16, ie 16 bytes. In the original coding this led to passing a palloc'd value of size 12 to the index insertion code, so that data would be fetched past the end of the allocated value during index tuple construction. This makes valgrind unhappy. In principle it could result in a SIGSEGV, though with the current implementation of palloc there's no risk since the 12-byte request size would be rounded up to 16 bytes anyway. To fix, add a field to struct gbtree_ninfo showing the declared size of the index datums, and use that in the palloc requests; and use palloc0 to be sure that any wasted bytes are cleanly initialized. Per report from Andres Freund. No back-patch since there's no current risk of a real problem.
193 lines
4.4 KiB
C
193 lines
4.4 KiB
C
/*
|
|
* contrib/btree_gist/btree_macaddr.c
|
|
*/
|
|
#include "postgres.h"
|
|
|
|
#include "btree_gist.h"
|
|
#include "btree_utils_num.h"
|
|
#include "utils/builtins.h"
|
|
#include "utils/inet.h"
|
|
|
|
typedef struct
|
|
{
|
|
macaddr lower;
|
|
macaddr upper;
|
|
} macKEY;
|
|
|
|
/*
|
|
** OID ops
|
|
*/
|
|
PG_FUNCTION_INFO_V1(gbt_macad_compress);
|
|
PG_FUNCTION_INFO_V1(gbt_macad_union);
|
|
PG_FUNCTION_INFO_V1(gbt_macad_picksplit);
|
|
PG_FUNCTION_INFO_V1(gbt_macad_consistent);
|
|
PG_FUNCTION_INFO_V1(gbt_macad_penalty);
|
|
PG_FUNCTION_INFO_V1(gbt_macad_same);
|
|
|
|
|
|
static bool
|
|
gbt_macadgt(const void *a, const void *b)
|
|
{
|
|
return DatumGetBool(DirectFunctionCall2(macaddr_gt, PointerGetDatum(a), PointerGetDatum(b)));
|
|
}
|
|
static bool
|
|
gbt_macadge(const void *a, const void *b)
|
|
{
|
|
return DatumGetBool(DirectFunctionCall2(macaddr_ge, PointerGetDatum(a), PointerGetDatum(b)));
|
|
}
|
|
|
|
static bool
|
|
gbt_macadeq(const void *a, const void *b)
|
|
{
|
|
return DatumGetBool(DirectFunctionCall2(macaddr_eq, PointerGetDatum(a), PointerGetDatum(b)));
|
|
}
|
|
|
|
static bool
|
|
gbt_macadle(const void *a, const void *b)
|
|
{
|
|
return DatumGetBool(DirectFunctionCall2(macaddr_le, PointerGetDatum(a), PointerGetDatum(b)));
|
|
}
|
|
|
|
static bool
|
|
gbt_macadlt(const void *a, const void *b)
|
|
{
|
|
return DatumGetBool(DirectFunctionCall2(macaddr_lt, PointerGetDatum(a), PointerGetDatum(b)));
|
|
}
|
|
|
|
|
|
static int
|
|
gbt_macadkey_cmp(const void *a, const void *b)
|
|
{
|
|
macKEY *ia = (macKEY *) (((const Nsrt *) a)->t);
|
|
macKEY *ib = (macKEY *) (((const Nsrt *) b)->t);
|
|
int res;
|
|
|
|
res = DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->lower), MacaddrPGetDatum(&ib->lower)));
|
|
if (res == 0)
|
|
return DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->upper), MacaddrPGetDatum(&ib->upper)));
|
|
|
|
return res;
|
|
}
|
|
|
|
|
|
static const gbtree_ninfo tinfo =
|
|
{
|
|
gbt_t_macad,
|
|
sizeof(macaddr),
|
|
16, /* sizeof(gbtreekey16) */
|
|
gbt_macadgt,
|
|
gbt_macadge,
|
|
gbt_macadeq,
|
|
gbt_macadle,
|
|
gbt_macadlt,
|
|
gbt_macadkey_cmp,
|
|
NULL
|
|
};
|
|
|
|
|
|
/**************************************************
|
|
* macaddr ops
|
|
**************************************************/
|
|
|
|
|
|
|
|
static uint64
|
|
mac_2_uint64(macaddr *m)
|
|
{
|
|
unsigned char *mi = (unsigned char *) m;
|
|
uint64 res = 0;
|
|
int i;
|
|
|
|
for (i = 0; i < 6; i++)
|
|
res += (((uint64) mi[i]) << ((uint64) ((5 - i) * 8)));
|
|
return res;
|
|
}
|
|
|
|
|
|
|
|
Datum
|
|
gbt_macad_compress(PG_FUNCTION_ARGS)
|
|
{
|
|
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
|
GISTENTRY *retval = NULL;
|
|
|
|
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_macad_consistent(PG_FUNCTION_ARGS)
|
|
{
|
|
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
|
macaddr *query = (macaddr *) PG_GETARG_POINTER(1);
|
|
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
|
|
|
|
/* Oid subtype = PG_GETARG_OID(3); */
|
|
bool *recheck = (bool *) PG_GETARG_POINTER(4);
|
|
macKEY *kkk = (macKEY *) DatumGetPointer(entry->key);
|
|
GBT_NUMKEY_R key;
|
|
|
|
/* All cases served by this function are exact */
|
|
*recheck = false;
|
|
|
|
key.lower = (GBT_NUMKEY *) &kkk->lower;
|
|
key.upper = (GBT_NUMKEY *) &kkk->upper;
|
|
|
|
PG_RETURN_BOOL(
|
|
gbt_num_consistent(&key, (void *) query, &strategy, GIST_LEAF(entry), &tinfo)
|
|
);
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_macad_union(PG_FUNCTION_ARGS)
|
|
{
|
|
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
|
|
void *out = palloc(sizeof(macKEY));
|
|
|
|
*(int *) PG_GETARG_POINTER(1) = sizeof(macKEY);
|
|
PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_macad_penalty(PG_FUNCTION_ARGS)
|
|
{
|
|
macKEY *origentry = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
|
|
macKEY *newentry = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
|
|
float *result = (float *) PG_GETARG_POINTER(2);
|
|
uint64 iorg[2],
|
|
inew[2];
|
|
|
|
iorg[0] = mac_2_uint64(&origentry->lower);
|
|
iorg[1] = mac_2_uint64(&origentry->upper);
|
|
inew[0] = mac_2_uint64(&newentry->lower);
|
|
inew[1] = mac_2_uint64(&newentry->upper);
|
|
|
|
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
|
|
|
|
PG_RETURN_POINTER(result);
|
|
|
|
}
|
|
|
|
Datum
|
|
gbt_macad_picksplit(PG_FUNCTION_ARGS)
|
|
{
|
|
PG_RETURN_POINTER(gbt_num_picksplit(
|
|
(GistEntryVector *) PG_GETARG_POINTER(0),
|
|
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
|
|
&tinfo
|
|
));
|
|
}
|
|
|
|
Datum
|
|
gbt_macad_same(PG_FUNCTION_ARGS)
|
|
{
|
|
macKEY *b1 = (macKEY *) PG_GETARG_POINTER(0);
|
|
macKEY *b2 = (macKEY *) PG_GETARG_POINTER(1);
|
|
bool *result = (bool *) PG_GETARG_POINTER(2);
|
|
|
|
*result = gbt_num_same((void *) b1, (void *) b2, &tinfo);
|
|
PG_RETURN_POINTER(result);
|
|
}
|