Skip to content

M
MariaDB
Commit 7bd7643a authored by unknown's avatar unknown
Browse files
Options

Merge with after merge fix 


BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
  Auto merged
include/my_global.h:
  Auto merged
myisam/mi_create.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_udf.cc:
  After merge fix
parents aec0408b e54b545a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 523 additions and 695 deletions
include/my_global.h
View file @ 7bd7643a
...@@ -523,6 +523,9 @@ typedef SOCKET_SIZE_TYPE size_socket; ...@@ -523,6 +523,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
#ifndef O_SHORT_LIVED #ifndef O_SHORT_LIVED
#define O_SHORT_LIVED 0 #define O_SHORT_LIVED 0
#endif #endif
#ifndef O_NOFOLLOW
#define O_NOFOLLOW 0
#endif
/* #define USE_RECORD_LOCK */ /* #define USE_RECORD_LOCK */
......
myisam/mi_create.c
View file @ 7bd7643a
...@@ -39,7 +39,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ...@@ -39,7 +39,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
{ {
register uint i,j; register uint i,j;
File dfile,file; File dfile,file;
int errpos,save_errno; int errpos,save_errno, create_mode= O_RDWR | O_TRUNC;
myf create_flag; myf create_flag;
uint fields,length,max_key_length,packed,pointer,real_length_diff, uint fields,length,max_key_length,packed,pointer,real_length_diff,
key_length,info_length,key_segs,options,min_key_length_skip, key_length,info_length,key_segs,options,min_key_length_skip,
...@@ -173,7 +173,10 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ...@@ -173,7 +173,10 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
if (!(options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD))) if (!(options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)))
min_pack_length+= varchar_length; min_pack_length+= varchar_length;
if (flags & HA_CREATE_TMP_TABLE) if (flags & HA_CREATE_TMP_TABLE)
{
options|= HA_OPTION_TMP_TABLE; options|= HA_OPTION_TMP_TABLE;
create_mode|= O_EXCL | O_NOFOLLOW;
}
if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM)) if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM))
{ {
options|= HA_OPTION_CHECKSUM; options|= HA_OPTION_CHECKSUM;
...@@ -573,9 +576,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ...@@ -573,9 +576,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
goto err; goto err;
} }
if ((file= my_create_with_symlink(linkname_ptr, if ((file= my_create_with_symlink(linkname_ptr, filename, 0, create_mode,
filename,
0, O_RDWR | O_TRUNC,
MYF(MY_WME | create_flag))) < 0) MYF(MY_WME | create_flag))) < 0)
goto err; goto err;
errpos=1; errpos=1;
...@@ -586,7 +587,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ...@@ -586,7 +587,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
if (share.base.raid_type) if (share.base.raid_type)
{ {
(void) fn_format(filename,name,"",MI_NAME_DEXT,2+4); (void) fn_format(filename,name,"",MI_NAME_DEXT,2+4);
if ((dfile=my_raid_create(filename,0,O_RDWR | O_TRUNC, if ((dfile=my_raid_create(filename, 0, create_mode,
share.base.raid_type, share.base.raid_type,
share.base.raid_chunks, share.base.raid_chunks,
share.base.raid_chunksize, share.base.raid_chunksize,
...@@ -610,8 +611,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, ...@@ -610,8 +611,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
create_flag=MY_DELETE_OLD; create_flag=MY_DELETE_OLD;
} }
if ((dfile= if ((dfile=
my_create_with_symlink(linkname_ptr, filename, my_create_with_symlink(linkname_ptr, filename, 0, create_mode,
0,O_RDWR | O_TRUNC,
MYF(MY_WME | create_flag))) < 0) MYF(MY_WME | create_flag))) < 0)
goto err; goto err;
} }
......
myisammrg/myrg_create.c
View file @ 7bd7643a
...@@ -34,7 +34,7 @@ int myrg_create(const char *name, const char **table_names, ...@@ -34,7 +34,7 @@ int myrg_create(const char *name, const char **table_names,
errpos=0; errpos=0;
if ((file = my_create(fn_format(buff,name,"",MYRG_NAME_EXT,4),0, if ((file = my_create(fn_format(buff,name,"",MYRG_NAME_EXT,4),0,
O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0)
goto err; goto err;
errpos=1; errpos=1;
if (table_names) if (table_names)
......
mysys/mf_tempfile.c
View file @ 7bd7643a
...@@ -70,7 +70,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, ...@@ -70,7 +70,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
{ {
strmake(to,res,FN_REFLEN-1); strmake(to,res,FN_REFLEN-1);
(*free)(res); (*free)(res);
file=my_create(to,0, mode, MyFlags); file=my_create(to,0, mode | O_EXCL | O_NOFOLLOW, MyFlags);
} }
environ=old_env; environ=old_env;
} }
...@@ -81,7 +81,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, ...@@ -81,7 +81,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
{ {
strmake(to,res,FN_REFLEN-1); strmake(to,res,FN_REFLEN-1);
(*free)(res); (*free)(res);
file=my_create(to, 0, mode, MyFlags); file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags);
} }
#elif defined(HAVE_MKSTEMP) && !defined(__NETWARE__) #elif defined(HAVE_MKSTEMP) && !defined(__NETWARE__)
{ {
...@@ -143,7 +143,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, ...@@ -143,7 +143,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
strmake(to,res,FN_REFLEN-1); strmake(to,res,FN_REFLEN-1);
(*free)(res); (*free)(res);
file=my_create(to,0, file=my_create(to,0,
(int) (O_RDWR | O_BINARY | O_TRUNC | (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW |
O_TEMPORARY | O_SHORT_LIVED), O_TEMPORARY | O_SHORT_LIVED),
MYF(MY_WME)); MYF(MY_WME));
...@@ -186,7 +186,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, ...@@ -186,7 +186,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
} }
(void) strmov(end_pos,TMP_EXT); (void) strmov(end_pos,TMP_EXT);
file=my_create(to,0, file=my_create(to,0,
(int) (O_RDWR | O_BINARY | O_TRUNC | (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW |
O_TEMPORARY | O_SHORT_LIVED), O_TEMPORARY | O_SHORT_LIVED),
MYF(MY_WME)); MYF(MY_WME));
} }
......
sql/ha_myisam.cc
View file @ 7bd7643a
...@@ -1350,7 +1350,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, ...@@ -1350,7 +1350,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
HA_CREATE_INFO *info) HA_CREATE_INFO *info)
{ {
int error; int error;
uint i,j,recpos,minpos,fieldpos,temp_length,length; uint i,j,recpos,minpos,fieldpos,temp_length,length, create_flags= 0;
bool found_real_auto_increment=0; bool found_real_auto_increment=0;
enum ha_base_keytype type; enum ha_base_keytype type;
char buff[FN_REFLEN]; char buff[FN_REFLEN];
...@@ -1538,17 +1538,21 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, ...@@ -1538,17 +1538,21 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
create_info.data_file_name= info->data_file_name; create_info.data_file_name= info->data_file_name;
create_info.index_file_name= info->index_file_name; create_info.index_file_name= info->index_file_name;
if (info->options & HA_LEX_CREATE_TMP_TABLE)
create_flags|= HA_CREATE_TMP_TABLE;
if (options & HA_OPTION_PACK_RECORD)
create_flags|= HA_PACK_RECORD;
if (options & HA_OPTION_CHECKSUM)
create_flags|= HA_CREATE_CHECKSUM;
if (options & HA_OPTION_DELAY_KEY_WRITE)
create_flags|= HA_CREATE_DELAY_KEY_WRITE;
/* TODO: Check that the following fn_format is really needed */ /* TODO: Check that the following fn_format is really needed */
error=mi_create(fn_format(buff,name,"","",2+4), error=mi_create(fn_format(buff,name,"","",2+4),
share->keys,keydef, share->keys,keydef,
(uint) (recinfo_pos-recinfo), recinfo, (uint) (recinfo_pos-recinfo), recinfo,
0, (MI_UNIQUEDEF*) 0, 0, (MI_UNIQUEDEF*) 0,
&create_info, &create_info, create_flags);
(((options & HA_OPTION_PACK_RECORD) ? HA_PACK_RECORD : 0) |
((options & HA_OPTION_CHECKSUM) ? HA_CREATE_CHECKSUM : 0) |
((options & HA_OPTION_DELAY_KEY_WRITE) ?
HA_CREATE_DELAY_KEY_WRITE : 0)));
my_free((gptr) recinfo,MYF(0)); my_free((gptr) recinfo,MYF(0));
DBUG_RETURN(error); DBUG_RETURN(error);
......
sql/mysql_priv.h
View file @ 7bd7643a
...@@ -1064,7 +1064,7 @@ extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types; ...@@ -1064,7 +1064,7 @@ extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;
extern my_bool opt_safe_show_db, opt_local_infile; extern my_bool opt_safe_show_db, opt_local_infile;
extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern my_bool opt_slave_compressed_protocol, use_temp_pool;
extern my_bool opt_readonly, lower_case_file_system; extern my_bool opt_readonly, lower_case_file_system;
extern my_bool opt_enable_named_pipe, opt_sync_frm; extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
extern my_bool opt_secure_auth; extern my_bool opt_secure_auth;
extern my_bool sp_automatic_privileges; extern my_bool sp_automatic_privileges;
extern my_bool opt_old_style_user_limits; extern my_bool opt_old_style_user_limits;
......
sql/mysqld.cc
View file @ 7bd7643a
This diff is collapsed.
sql/sql_udf.cc
View file @ 7bd7643a
...@@ -74,32 +74,49 @@ static HASH udf_hash; ...@@ -74,32 +74,49 @@ static HASH udf_hash;
static rw_lock_t THR_LOCK_udf; static rw_lock_t THR_LOCK_udf;
static udf_func *add_udf(LEX_STRING *name, Item_result ret, char *dl, static udf_func *add_udf(LEX_STRING *name, Item_result ret,
Item_udftype typ); char *dl, Item_udftype typ);
static void del_udf(udf_func *udf); static void del_udf(udf_func *udf);
static void *find_udf_dl(const char *dl); static void *find_udf_dl(const char *dl);
static char *init_syms(udf_func *tmp, char *nm)
static void init_syms(udf_func *tmp)
{ {
char nm[MAX_FIELD_NAME+16],*end; char *end;
if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name.str))))
return tmp->name.str;
tmp->func = dlsym(tmp->dlhandle, tmp->name.str);
end=strmov(nm,tmp->name.str); end=strmov(nm,tmp->name.str);
(void) strmov(end,"_init");
tmp->func_init = dlsym(tmp->dlhandle, nm);
(void) strmov(end,"_deinit");
tmp->func_deinit = dlsym(tmp->dlhandle, nm);
if (tmp->type == UDFTYPE_AGGREGATE) if (tmp->type == UDFTYPE_AGGREGATE)
{ {
(void)strmov( end, "_clear" ); (void)strmov(end, "_clear");
tmp->func_clear = dlsym( tmp->dlhandle, nm ); if (!((tmp->func_clear= dlsym(tmp->dlhandle, nm))))
(void)strmov( end, "_add" ); return nm;
tmp->func_add = dlsym( tmp->dlhandle, nm ); (void)strmov(end, "_add");
/* Give error if _clear and _add doesn't exists */ if (!((tmp->func_add= dlsym(tmp->dlhandle, nm))))
if (!tmp->func_clear || ! tmp->func_add) return nm;
tmp->func= 0; }
(void) strmov(end,"_deinit");
tmp->func_deinit= dlsym(tmp->dlhandle, nm);
(void) strmov(end,"_init");
tmp->func_init= dlsym(tmp->dlhandle, nm);
/*
to prefent loading "udf" from, e.g. libc.so
let's ensure that at least one auxiliary symbol is defined
*/
if (!tmp->func_init && !tmp->func_deinit && tmp->type != UDFTYPE_AGGREGATE)
{
if (opt_allow_suspicious_udfs)
sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), nm);
else
return nm;
} }
return 0;
} }
extern "C" byte* get_hash_key(const byte *buff,uint *length, extern "C" byte* get_hash_key(const byte *buff,uint *length,
...@@ -111,7 +128,7 @@ extern "C" byte* get_hash_key(const byte *buff,uint *length, ...@@ -111,7 +128,7 @@ extern "C" byte* get_hash_key(const byte *buff,uint *length,
} }
/* /*
** Read all predeclared functions from func@mysql and accept all that ** Read all predeclared functions from mysql.func and accept all that
** can be used. ** can be used.
*/ */
...@@ -153,7 +170,7 @@ void udf_init() ...@@ -153,7 +170,7 @@ void udf_init()
if (simple_open_n_lock_tables(new_thd, &tables)) if (simple_open_n_lock_tables(new_thd, &tables))
{ {
DBUG_PRINT("error",("Can't open udf table")); DBUG_PRINT("error",("Can't open udf table"));
sql_print_error("Can't open the mysql/func table. Please run the mysql_install_db script to create it."); sql_print_error("Can't open the mysql.func table. Please run the mysql_install_db script to create it.");
goto end; goto end;
} }
...@@ -171,10 +188,23 @@ void udf_init() ...@@ -171,10 +188,23 @@ void udf_init()
if (table->s->fields >= 4) // New func table if (table->s->fields >= 4) // New func table
udftype=(Item_udftype) table->field[3]->val_int(); udftype=(Item_udftype) table->field[3]->val_int();
if (!(tmp = add_udf(&name,(Item_result) table->field[1]->val_int(), /*
dl_name, udftype))) Ensure that the .dll doesn't have a path
This is done to ensure that only approved dll from the system
directories are used (to make this even remotely secure).
*/
if (strchr(dl_name, '/') || name.length > NAME_LEN)
{
sql_print_error("Invalid row in mysql.func table for function '%.64s'",
name.str);
continue;
}
if (!(tmp= add_udf(&name,(Item_result) table->field[1]->val_int(),
dl_name, udftype)))
{ {
sql_print_error("Can't alloc memory for udf function: name"); sql_print_error("Can't alloc memory for udf function: '%.64s'", name.str);
continue; continue;
} }
...@@ -191,13 +221,15 @@ void udf_init() ...@@ -191,13 +221,15 @@ void udf_init()
new_dl=1; new_dl=1;
} }
tmp->dlhandle = dl; tmp->dlhandle = dl;
init_syms(tmp);
if (!tmp->func)
{ {
sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), name); char buf[MAX_FIELD_NAME+16], *missing;
del_udf(tmp); if ((missing= init_syms(tmp, buf)))
if (new_dl) {
dlclose(dl); sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing);
del_udf(tmp);
if (new_dl)
dlclose(dl);
}
} }
} }
if (error > 0) if (error > 0)
...@@ -239,7 +271,7 @@ void udf_free() ...@@ -239,7 +271,7 @@ void udf_free()
{ {
initialized= 0; initialized= 0;
rwlock_destroy(&THR_LOCK_udf); rwlock_destroy(&THR_LOCK_udf);
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -407,12 +439,13 @@ int mysql_create_function(THD *thd,udf_func *udf) ...@@ -407,12 +439,13 @@ int mysql_create_function(THD *thd,udf_func *udf)
new_dl=1; new_dl=1;
} }
udf->dlhandle=dl; udf->dlhandle=dl;
init_syms(udf);
if (udf->func == NULL)
{ {
my_error(ER_CANT_FIND_DL_ENTRY, MYF(0), udf->name); char buf[MAX_FIELD_NAME+16], *missing;
goto err; if ((missing= init_syms(udf, buf)))
{
my_error(ER_CANT_FIND_DL_ENTRY, MYF(0), missing);
goto err;
}
} }
udf->name.str=strdup_root(&mem,udf->name.str); udf->name.str=strdup_root(&mem,udf->name.str);
udf->dl=strdup_root(&mem,udf->dl); udf->dl=strdup_root(&mem,udf->dl);
...@@ -425,7 +458,7 @@ int mysql_create_function(THD *thd,udf_func *udf) ...@@ -425,7 +458,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
u_d->func_clear=udf->func_clear; u_d->func_clear=udf->func_clear;
u_d->func_add=udf->func_add; u_d->func_add=udf->func_add;
/* create entry in mysql/func table */ /* create entry in mysql.func table */
bzero((char*) &tables,sizeof(tables)); bzero((char*) &tables,sizeof(tables));
tables.db= (char*) "mysql"; tables.db= (char*) "mysql";
...@@ -445,7 +478,7 @@ int mysql_create_function(THD *thd,udf_func *udf) ...@@ -445,7 +478,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
close_thread_tables(thd); close_thread_tables(thd);
if (error) if (error)
{ {
my_error(ER_ERROR_ON_WRITE, MYF(0), "func@mysql", error); my_error(ER_ERROR_ON_WRITE, MYF(0), "mysql.func", error);
del_udf(u_d); del_udf(u_d);
goto err; goto err;
} }
......
sql/table.cc
View file @ 7bd7643a
...@@ -1276,6 +1276,10 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo, ...@@ -1276,6 +1276,10 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo,
uint key_length; uint key_length;
ulong length; ulong length;
char fill[IO_SIZE]; char fill[IO_SIZE];
int create_flags= O_RDWR | O_TRUNC;
if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
create_flags|= O_EXCL | O_NOFOLLOW;
#if SIZEOF_OFF_T > 4 #if SIZEOF_OFF_T > 4
/* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */ /* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */
...@@ -1290,7 +1294,7 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo, ...@@ -1290,7 +1294,7 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo,
*/ */
set_if_smaller(create_info->raid_chunks, 255); set_if_smaller(create_info->raid_chunks, 255);
if ((file=my_create(name,CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0) if ((file= my_create(name, CREATE_MODE, create_flags, MYF(MY_WME))) >= 0)
{ {
bzero((char*) fileinfo,64); bzero((char*) fileinfo,64);
/* header */ /* header */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7