Commit 4e6e4229 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are two small staging driver fixes for the vc04_services driver
  that resolve reported problems:

   - strncpy fix for information leak

   - another information leak discovered by the previous strncpy fix

  Both of these have been in linux-next all this past week with no
  reported issues"

* tag 'staging-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vc04_services: fix information leak in create_component()
  staging: vc04_services: changen strncpy() to strscpy_pad()
parents 486291a0 f37e76ab
...@@ -937,8 +937,9 @@ static int create_component(struct vchiq_mmal_instance *instance, ...@@ -937,8 +937,9 @@ static int create_component(struct vchiq_mmal_instance *instance,
/* build component create message */ /* build component create message */
m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE; m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE;
m.u.component_create.client_component = component->client_component; m.u.component_create.client_component = component->client_component;
strncpy(m.u.component_create.name, name, strscpy_pad(m.u.component_create.name, name,
sizeof(m.u.component_create.name)); sizeof(m.u.component_create.name));
m.u.component_create.pid = 0;
ret = send_synchronous_mmal_msg(instance, &m, ret = send_synchronous_mmal_msg(instance, &m,
sizeof(m.u.component_create), sizeof(m.u.component_create),
......
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