mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 19:19:32 +03:00
3 minor fixups where sprintf() was used instead of snprintf() with
a known max length. Additionally the function return value is cast to void to make it explicit that the value is not needed. git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@172 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
parent
0498e6c585
commit
12018327f5
@ -446,7 +446,7 @@ proc_dohostid(struct ctl_table *table, int write, struct file *filp,
|
|||||||
RETURN(-EINVAL);
|
RETURN(-EINVAL);
|
||||||
|
|
||||||
spl_hostid = (long)val;
|
spl_hostid = (long)val;
|
||||||
sprintf(hw_serial, "%u", (val >= 0) ? val : -val);
|
(void)snprintf(hw_serial, 11, "%u", (val >= 0) ? val : -val);
|
||||||
*ppos += *lenp;
|
*ppos += *lenp;
|
||||||
} else {
|
} else {
|
||||||
len = snprintf(str, sizeof(str), "%lx", spl_hostid);
|
len = snprintf(str, sizeof(str), "%lx", spl_hostid);
|
||||||
|
@ -161,18 +161,18 @@ vn_openat(const char *path, uio_seg_t seg, int flags, int mode,
|
|||||||
vnode_t **vpp, int x1, void *x2, vnode_t *vp, int fd)
|
vnode_t **vpp, int x1, void *x2, vnode_t *vp, int fd)
|
||||||
{
|
{
|
||||||
char *realpath;
|
char *realpath;
|
||||||
int rc;
|
int len, rc;
|
||||||
ENTRY;
|
ENTRY;
|
||||||
|
|
||||||
ASSERT(vp == rootdir);
|
ASSERT(vp == rootdir);
|
||||||
|
|
||||||
realpath = kmalloc(strlen(path) + 2, GFP_KERNEL);
|
len = strlen(path) + 2;
|
||||||
|
realpath = kmalloc(len, GFP_KERNEL);
|
||||||
if (!realpath)
|
if (!realpath)
|
||||||
RETURN(ENOMEM);
|
RETURN(ENOMEM);
|
||||||
|
|
||||||
sprintf(realpath, "/%s", path);
|
(void)snprintf(realpath, len, "/%s", path);
|
||||||
rc = vn_open(realpath, seg, flags, mode, vpp, x1, x2);
|
rc = vn_open(realpath, seg, flags, mode, vpp, x1, x2);
|
||||||
|
|
||||||
kfree(realpath);
|
kfree(realpath);
|
||||||
|
|
||||||
RETURN(rc);
|
RETURN(rc);
|
||||||
|
@ -601,7 +601,8 @@ splat_kmem_test8_sc(struct file *file, void *arg, int size, int count)
|
|||||||
spin_lock_init(&kcp.kcp_lock);
|
spin_lock_init(&kcp.kcp_lock);
|
||||||
init_waitqueue_head(&kcp.kcp_waitq);
|
init_waitqueue_head(&kcp.kcp_waitq);
|
||||||
|
|
||||||
sprintf(cache_name, "%s-%d-%d", SPLAT_KMEM_CACHE_NAME, size, i);
|
(void)snprintf(cache_name, 32, "%s-%d-%d",
|
||||||
|
SPLAT_KMEM_CACHE_NAME, size, i);
|
||||||
kcp.kcp_cache = kmem_cache_create(cache_name, kcp.kcp_size, 0,
|
kcp.kcp_cache = kmem_cache_create(cache_name, kcp.kcp_size, 0,
|
||||||
splat_kmem_cache_test_constructor,
|
splat_kmem_cache_test_constructor,
|
||||||
splat_kmem_cache_test_destructor,
|
splat_kmem_cache_test_destructor,
|
||||||
|
Loading…
Reference in New Issue
Block a user