Re: linux-next: dock_link_device is oopsy

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


On Sat, Feb 18, 2012 at 9:26 PM, Holger Macht <holger@xxxxxxxx> wrote:
> On Sa 18. Feb - 21:05:18, Hillf Danton wrote:
>> On Sat, Feb 18, 2012 at 7:14 PM, Holger Macht <holger@xxxxxxxx> wrote:
>> > So how about that?
>> >
>> > acpi: Bail out when linking devices and there are no dock stations
>> >
>> > If dock_station_count is zero, we allocate zero memory and don't check
>> > this at future references. So bail out if there are actually no dock
>> > stations.
>> >
>> > Signed-off-by: Holger Macht <holger@xxxxxxxx>
>> > ---
>> >  drivers/acpi/dock.c |   19 ++++++++++++++-----
>> >  1 files changed, 14 insertions(+), 5 deletions(-)
>> >
>> > diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
>> > index b5e4142..0b3072c 100644
>> > --- a/drivers/acpi/dock.c
>> > +++ b/drivers/acpi/dock.c
>> > @@ -281,11 +281,15 @@ EXPORT_SYMBOL_GPL(is_dock_device);
>> >  */
>> >  struct device **dock_link_device(acpi_handle handle)
>> >  {
>> > -       struct device *dev = acpi_get_physical_device(handle);
>> > +       struct device *dev;
>> >        struct dock_station *dock_station;
>> >        int ret, dock = 0;
>> >        struct device **devices;
>> >
>> > +       if (!dock_station_count)
>> > +               return NULL;
>> > +
>> > +       dev = acpi_get_physical_device(handle);
>> >        devices = kmalloc(dock_station_count * sizeof(struct device *),
>> >                          GFP_KERNEL);
>> >
>> > @@ -320,12 +324,17 @@ EXPORT_SYMBOL_GPL(dock_link_device);
>> >  */
>> >  struct device **dock_unlink_device(acpi_handle handle)
>> >  {
>> > -       struct device *dev = acpi_get_physical_device(handle);
>> > +       struct device *dev;
>> >        struct dock_station *dock_station;
>> >        int dock = 0;
>> > -       struct device **devices =
>> > -               kmalloc(dock_station_count * sizeof(struct device *),
>> > -                       GFP_KERNEL);
>> > +       struct device **devices;
>> > +
>> > +       if (!dock_station_count)
>> > +               return NULL;
>> > +
>> > +       dev = acpi_get_physical_device(handle);
>> > +       devices = kmalloc(dock_station_count * sizeof(struct device *),
>> > +                         GFP_KERNEL);
>> >
>>
>> If bail out in this way, another patch looks needed to fix up
>> mem leakage :-(
>
> Sorry if I'm a little slow...but where is the leakage? The function
> doesn't allocate anything before bailing out in the dock_station_count
> check. And the rerun value should be freed by the caller. Please point
> me in the right direction.
>

Hi  Holger

Lets check the following snippet from what you posted,

> @@ -320,12 +324,17 @@ EXPORT_SYMBOL_GPL(dock_link_device);
>  */
>  struct device **dock_unlink_device(acpi_handle handle)
>  {
> -       struct device *dev = acpi_get_physical_device(handle);
> +       struct device *dev;
>        struct dock_station *dock_station;
>        int dock = 0;
> -       struct device **devices =
> -               kmalloc(dock_station_count * sizeof(struct device *),
> -                       GFP_KERNEL);
> +       struct device **devices;
> +
> +       if (!dock_station_count)
> +               return NULL;
> +
> +       dev = acpi_get_physical_device(handle);
> +       devices = kmalloc(dock_station_count * sizeof(struct device *),
> +                         GFP_KERNEL);
>
>        if (!dev)
>                return NULL;  <=== here return without freeing the newly
                                               allocated devices after checking
                                               dock_station_count is not zero
> --
> 1.7.7
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[Other Archives]     [Linux Kernel Newbies]     [Linux Driver Development]     [Fedora Kernel]     [Linux Kernel Testers]     [Linux SH]     [Linux Omap]     [Linux Kbuild]     [Linux Tape]     [Linux Input]     [Linux Kernel Janitors]     [Linux Kernel Packagers]     [Linux Doc]     [Linux Man Pages]     [Linux API]     [Linux Memory Management]     [Linux Modules]     [Linux Standards]     [Kernel Announce]     [Netdev]     [Git]     [Linux PCI]     Linux CAN Development     [Linux I2C]     [Linux RDMA]     [Linux NUMA]     [Netfilter]     [Netfilter Devel]     [SELinux]     [Bugtraq]     [FIO]     [Linux Perf Users]     [Linux Serial]     [Linux PPP]     [Linux ISDN]     [Linux Next]     [Kernel Stable Commits]     [Linux Tip Commits]     [Kernel MM Commits]     [Linux Security Module]     [Filesystem Development]     [Ext3 Filesystem]     [Linux bcache]     [Ext4 Filesystem]     [Linux BTRFS]     [Linux CEPH Filesystem]     [Linux XFS]     [XFS]     [Linux NFS]     [Linux CIFS]     [Ecryptfs]     [Linux NILFS]     [Linux Cachefs]     [Reiser FS]     [Initramfs]     [Linux FB Devel]     [Linux OpenGL]     [DRI Devel]     [Fastboot]     [Linux RT Users]     [Linux RT Stable]     [eCos]     [Corosync]     [Linux Clusters]     [LVS Devel]     [Hot Plug]     [Linux Virtualization]     [KVM]     [KVM PPC]     [KVM ia64]     [Linux Containers]     [Linux Hexagon]     [Linux Cgroups]     [Util Linux]     [Wireless]     [Linux Bluetooth]     [Bluez Devel]     [Ethernet Bridging]     [Embedded Linux]     [Barebox]     [Linux MMC]     [Linux IIO]     [Sparse]     [Smatch]     [Linux Arch]     [x86 Platform Driver]     [Linux ACPI]     [Linux IBM ACPI]     [LM Sensors]     [CPU Freq]     [Linux Power Management]     [Linmodems]     [Linux DCCP]     [Linux SCTP]     [ALSA Devel]     [Linux USB]     [Linux PA RISC]     [Linux Samsung SOC]     [MIPS Linux]     [IBM S/390 Linux]     [ARM Linux]     [ARM Kernel]     [ARM MSM]     [Tegra Devel]     [Sparc Linux]     [Linux Security]     [Linux Sound]     [Linux Media]     [Video 4 Linux]     [Linux IRDA Users]     [Linux for the blind]     [Linux RAID]     [Linux ATA RAID]     [Device Mapper]     [Linux SCSI]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Linux IDE]     [Linux SMP]     [Linux AXP]     [Linux Alpha]     [Linux M68K]     [Linux ia64]     [Linux 8086]     [Linux x86_64]     [Linux Config]     [Linux Apps]     [Linux MSDOS]     [Linux X.25]     [Linux Crypto]     [DM Crypt]     [Linux Trace Users]     [Linux Btrace]     [Linux Watchdog]     [Utrace Devel]     [Linux C Programming]     [Linux Assembly]     [Dash]     [DWARVES]     [Hail Devel]     [Linux Kernel Debugger]     [Linux gcc]     [Gcc Help]     [X.Org]     [Wine]

Add to Google Powered by Linux

[Older Kernel Discussion]     [Yosemite National Park Forum]     [Large Format Photos]     [Gimp]     [Yosemite Photos]     [Stuff]