| Message ID | 32c1313a080a206a70a57455794ec2116906902f.1449489553.git.michal.simek@xilinx.com |
|---|---|
| State | Deferred |
| Delegated to: | Łukasz Majewski |
| Headers | show |
Hi guys, On 7.12.2015 12:59, Michal Simek wrote: > From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> > > Fix the memory leak by freeing the allocated out request buffer > > Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > drivers/usb/gadget/f_thor.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c > index a60e9487e774..75b72902c9d5 100644 > --- a/drivers/usb/gadget/f_thor.c > +++ b/drivers/usb/gadget/f_thor.c > @@ -51,6 +51,7 @@ DEFINE_CACHE_ALIGN_BUFFER(unsigned char, thor_rx_data_buf, > DEFINE_CACHE_ALIGN_BUFFER(char, f_name, F_NAME_BUF_SIZE); > static unsigned long long int thor_file_size; > static int alt_setting_num; > +static void *out_req_buf; > > static void send_rsp(const struct rsp_box *rsp) > { > @@ -891,6 +892,8 @@ static void thor_func_disable(struct usb_function *f) > } > > if (dev->out_ep->driver_data) { > + if (out_req_buf) > + free(out_req_buf); > dev->out_req->buf = NULL; > usb_ep_free_request(dev->out_ep, dev->out_req); > usb_ep_disable(dev->out_ep); > @@ -947,6 +950,7 @@ static int thor_eps_setup(struct usb_function *f) > } > > dev->out_req = req; > + out_req_buf = dev->out_req->buf; > /* ACM control EP */ > ep = dev->int_ep; > ep->driver_data = cdev; /* claim */ > any update on this one? Thanks, Michal
On Thursday, February 04, 2016 at 12:34:57 PM, Michal Simek wrote: > Hi guys, > > On 7.12.2015 12:59, Michal Simek wrote: > > From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> > > > > Fix the memory leak by freeing the allocated out request buffer > > > > Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > > --- > > > > drivers/usb/gadget/f_thor.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c > > index a60e9487e774..75b72902c9d5 100644 > > --- a/drivers/usb/gadget/f_thor.c > > +++ b/drivers/usb/gadget/f_thor.c > > @@ -51,6 +51,7 @@ DEFINE_CACHE_ALIGN_BUFFER(unsigned char, > > thor_rx_data_buf, > > > > DEFINE_CACHE_ALIGN_BUFFER(char, f_name, F_NAME_BUF_SIZE); > > static unsigned long long int thor_file_size; > > static int alt_setting_num; > > > > +static void *out_req_buf; > > > > static void send_rsp(const struct rsp_box *rsp) > > { > > > > @@ -891,6 +892,8 @@ static void thor_func_disable(struct usb_function *f) > > > > } > > > > if (dev->out_ep->driver_data) { > > > > + if (out_req_buf) > > + free(out_req_buf); Why don't you call free(dev->out_req->buf); here instead ? Then you won't need that new variable you introduce. > > dev->out_req->buf = NULL; > > usb_ep_free_request(dev->out_ep, dev->out_req); > > usb_ep_disable(dev->out_ep); > > > > @@ -947,6 +950,7 @@ static int thor_eps_setup(struct usb_function *f) > > > > } > > > > dev->out_req = req; > > > > + out_req_buf = dev->out_req->buf; > > > > /* ACM control EP */ > > ep = dev->int_ep; > > ep->driver_data = cdev; /* claim */ > > any update on this one? > > Thanks, > Michal Best regards, Marek Vasut
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index a60e9487e774..75b72902c9d5 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -51,6 +51,7 @@ DEFINE_CACHE_ALIGN_BUFFER(unsigned char, thor_rx_data_buf, DEFINE_CACHE_ALIGN_BUFFER(char, f_name, F_NAME_BUF_SIZE); static unsigned long long int thor_file_size; static int alt_setting_num; +static void *out_req_buf; static void send_rsp(const struct rsp_box *rsp) { @@ -891,6 +892,8 @@ static void thor_func_disable(struct usb_function *f) } if (dev->out_ep->driver_data) { + if (out_req_buf) + free(out_req_buf); dev->out_req->buf = NULL; usb_ep_free_request(dev->out_ep, dev->out_req); usb_ep_disable(dev->out_ep); @@ -947,6 +950,7 @@ static int thor_eps_setup(struct usb_function *f) } dev->out_req = req; + out_req_buf = dev->out_req->buf; /* ACM control EP */ ep = dev->int_ep; ep->driver_data = cdev; /* claim */