On 2014/4/9 13:07, Jianguo Wu wrote: > Hi Greg, > > On 2014/4/5 6:45, Greg KH wrote: > >> On Tue, Mar 11, 2014 at 07:39:53PM +0800, Jianguo Wu wrote: >>> Hi Greg, >>> >>> These are the part 2 commits that I've analyzed from the list of >>> upstream commits that have been backported to 3.2 but missing from 3.4. >>> >>> For the 9 commits, >>> - 6 commits were marked for stable but can't be applied cleanly to 3.4. >>> - 1 commit was marked for stable and can be applied cleanly and the fix >>> is obviously correct, don't know why it's absent from 3.4.x. (*) >>> - 1 commit has no stable tag. I've found out why it was backported to 3.2.x, >>> and I'm sure it should be applied to 3.4.x. (**) >>> - 1 commit has been reverted in upstream and 3.2.x. >>> >>> Please cherry-pick those commits from 3.2.x: >>> >>> e06c33874253 Staging: zram: Fix memory leak by refcount mismatch >>> dccfb68c2630 Staging: zram: Fix access of NULL pointer >>> 498a727b33ee zram: allow request end to coincide with disksize >>> e1c3e37d2c1d zram: protect sysfs handler from invalid memory access >>> 624d1705fa1d zram: avoid access beyond the zram device >>> 29c303b89a1b zram: destroy all devices on error recovery path in zram_init() >>> fd162a76f160 zram: avoid invalid memory access in zram_exit() >>> 41247561dc21 zram: Fix deadlock bug in partial read/write >>> >>> (*) The commit is 624d1705fa1d (zram: avoid access beyond the zram device) >>> (**) The commit is 498a727b33ee (zram: allow request end to coincide with disksize) >>> --- >>> drivers/staging/zram/zram_drv.c | 38 ++++++++++++++++++++++++------------ >>> drivers/staging/zram/zram_sysfs.c | 27 +++++++++++++++++++------ >>> 2 files changed, 45 insertions(+), 20 deletions(-) >> >> Can you please backport these to 3.4 properly so that I can apply them? >> I had to resolve issues by hand for the first two, which was fine, but >> the third one I had no idea what to do. >> >> So, can you just send me a series of patches that will apply properly? >> Hi Greg, Cloud you please cherry-pick these backports from 3.2.x as following order, they can be applied clean on top of Linux 3.4.87: 41247561dc21 zram: Fix deadlock bug in partial read/write fd162a76f160 zram: avoid invalid memory access in zram_exit() 29c303b89a1b zram: destroy all devices on error recovery path in zram_init() 624d1705fa1d zram: avoid access beyond the zram device e1c3e37d2c1d zram: protect sysfs handler from invalid memory access 498a727b33ee zram: allow request end to coincide with disksize dccfb68c2630 Staging: zram: Fix access of NULL pointer e06c33874253 Staging: zram: Fix memory leak by refcount mismatch Thanks, Jianguo Wu. > > Sorry, I mistook the order. Please cherry-pick from 3.2.x as following order: > > 41247561dc21 zram: Fix deadlock bug in partial read/write > fd162a76f160 zram: avoid invalid memory access in zram_exit() > 29c303b89a1b zram: destroy all devices on error recovery path in zram_init() > 624d1705fa1d zram: avoid access beyond the zram device > e1c3e37d2c1d zram: protect sysfs handler from invalid memory access > 498a727b33ee zram: allow request end to coincide with disksize > dccfb68c2630 Staging: zram: Fix access of NULL pointer > e06c33874253 Staging: zram: Fix memory leak by refcount mismatch > > Thanks, > Jianguo Wu. > >> thanks, >> >> greg k-h >> >> . >> > > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html