diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-07 13:25:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-07 13:25:45 +1100 |
| commit | 37f8e62719e3382fbc7957612f3dc8a8c0e769de (patch) | |
| tree | e018050d9c9b71937a7eea62984815a380b0781b | |
| parent | a734804a91c2ac26fc28fd75ab1081be7b359860 (diff) | |
| parent | 9be757b36db832e7541cf1c5bc1866f806dafb81 (diff) | |
| download | linux-37f8e62719e3382fbc7957612f3dc8a8c0e769de.tar.gz linux-37f8e62719e3382fbc7957612f3dc8a8c0e769de.tar.xz | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/media/platform/sti/delta/delta-ipc.c | 4 | ||||
| -rw-r--r-- | fs/inode.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/platform/sti/delta/delta-ipc.c b/drivers/media/platform/sti/delta/delta-ipc.c index a4603d573c34..bd1bbbeedec3 100644 --- a/drivers/media/platform/sti/delta/delta-ipc.c +++ b/drivers/media/platform/sti/delta/delta-ipc.c @@ -175,8 +175,8 @@ int delta_ipc_open(struct delta_ctx *pctx, const char *name, msg.ipc_buf_size = ipc_buf_size; msg.ipc_buf_paddr = ctx->ipc_buf->paddr; - memcpy(msg.name, name, sizeof(msg.name)); - msg.name[sizeof(msg.name) - 1] = 0; + memset(msg.name, 0, sizeof(msg.name)); + strcpy(msg.name, name); msg.param_size = param->size; memcpy(ctx->ipc_buf->vaddr, param->data, msg.param_size); diff --git a/fs/inode.c b/fs/inode.c index 35d2108d567c..0cd47fe0dbe5 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2149,7 +2149,9 @@ EXPORT_SYMBOL(timespec64_trunc); */ struct timespec64 current_time(struct inode *inode) { - struct timespec64 now = current_kernel_time64(); + struct timespec64 now; + + ktime_get_coarse_real_ts64(&now); if (unlikely(!inode->i_sb)) { WARN(1, "current_time() called with uninitialized super_block in the inode"); |