diff options
-rw-r--r-- | drivers/firmware/dell_rbu.c | 4 | ||||
-rw-r--r-- | security/keys/keyctl.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index 13946ebd77d6..b4704e150b28 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
@@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struct kobject *kobj, | |||
576 | { | 576 | { |
577 | int size = 0; | 577 | int size = 0; |
578 | if (!pos) | 578 | if (!pos) |
579 | size = sprintf(buffer, "%s\n", image_type); | 579 | size = scnprintf(buffer, count, "%s\n", image_type); |
580 | return size; | 580 | return size; |
581 | } | 581 | } |
582 | 582 | ||
@@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj, | |||
648 | int size = 0; | 648 | int size = 0; |
649 | if (!pos) { | 649 | if (!pos) { |
650 | spin_lock(&rbu_data.lock); | 650 | spin_lock(&rbu_data.lock); |
651 | size = sprintf(buffer, "%lu\n", rbu_data.packetsize); | 651 | size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize); |
652 | spin_unlock(&rbu_data.lock); | 652 | spin_unlock(&rbu_data.lock); |
653 | } | 653 | } |
654 | return size; | 654 | return size; |
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index e9335e1c6cf5..b1ec3b4ee17d 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
@@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const char __user *_name) | |||
270 | 270 | ||
271 | /* join the session */ | 271 | /* join the session */ |
272 | ret = join_session_keyring(name); | 272 | ret = join_session_keyring(name); |
273 | kfree(name); | ||
273 | 274 | ||
274 | error: | 275 | error: |
275 | return ret; | 276 | return ret; |