October 2018 - Linux-stable-mirror

by Kate

We are an imaging team who can process 300+ images daily. If you need any image editing service, please contact us today. We do mainly images cut out and clipping path, masking. Such as for your ecommerce photos, jewelry photos retouching, also it is for beauty portraits and skin images and wedding photos. We provide test editing if you send some photos. Thanks, Kate

6 years, 2 months

1
0
0 0

Re: [PATCH 1/4] Revert "ceph: fix dentry leak in splice_dentry()"

by Jeff Layton

On Wed, 2018-10-24 at 14:24 +0800, Yan, Zheng wrote: > On Mon, Oct 15, 2018 at 9:05 PM Jeff Layton <jlayton(a)redhat.com> wrote: > > > > On Mon, 2018-10-15 at 20:37 +0800, Yan, Zheng wrote: > > > > On Oct 15, 2018, at 19:29, Jeff Layton <jlayton(a)redhat.com> wrote: > > > > > > > > On Mon, 2018-10-15 at 09:58 +0800, Yan, Zheng wrote: > > > > > > On Oct 12, 2018, at 18:56, Jeff Layton <jlayton(a)redhat.com> wrote: > > > > > > > > > > > > On Fri, 2018-10-12 at 10:39 +0800, Yan, Zheng wrote: > > > > > > > > On Oct 11, 2018, at 22:49, Jeff Layton <jlayton(a)redhat.com> wrote: > > > > > > > > > > > > > > > > On Fri, 2018-09-28 at 17:43 +0800, Yan, Zheng wrote: > > > > > > > > > This reverts commit 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3. > > > > > > > > > > > > > > > > > > splice_dentry() is used by three places. For two places, req->r_dentry > > > > > > > > > is passed to splice_dentry(). In the case of error, req->r_dentry does > > > > > > > > > not get updated. So splice_dentry() should not drop reference. > > > > > > > > > > > > > > > > > > Cc: stable(a)vger.kernel.org #4.18 > > > > > > > > > Signed-off-by: "Yan, Zheng" <zyan(a)redhat.com> > > > > > > > > > --- > > > > > > > > > fs/ceph/inode.c | 1 - > > > > > > > > > 1 file changed, 1 deletion(-) > > > > > > > > > > > > > > > > > > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > > > > > > > > > index c6bbb7aa99e4..375924b2bc86 100644 > > > > > > > > > --- a/fs/ceph/inode.c > > > > > > > > > +++ b/fs/ceph/inode.c > > > > > > > > > @@ -1140,7 +1140,6 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in) > > > > > > > > > if (IS_ERR(realdn)) { > > > > > > > > > pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", > > > > > > > > > PTR_ERR(realdn), dn, in, ceph_vinop(in)); > > > > > > > > > - dput(dn); > > > > > > > > > dn = realdn; /* note realdn contains the error */ > > > > > > > > > goto out; > > > > > > > > > } else if (realdn) { > > > > > > > > > > > > > > > > This might be ok, buI have some real concerns about splice_dentry and > > > > > > > > its callers -- particularly ceph_fill_trace: > > > > > > > > > > > > > > > > We hold a reference to dn on entry to splice_dentry. We then call > > > > > > > > d_splice_alias and get back an error, and now we don't put the old > > > > > > > > dentry. > > > > > > > > > > > > > > > > Fine -- we have to then expect the caller to do it. Unfortunately, the > > > > > > > > callers in ceph_fill_trace do this: > > > > > > > > > > > > > > > > dn = splice_dentry(dn, in); > > > > > > > > if (IS_ERR(dn)) { > > > > > > > > err = PTR_ERR(dn); > > > > > > > > goto done; > > > > > > > > } > > > > > > > > req->r_dentry = dn; /* may have spliced */ > > > > > > > > > > > > > > > > The old value of dn gets clobbered once that comes back with an ERR_PTR. > > > > > > > > I guess we could claim that r_dentry will still be set to the old value > > > > > > > > at that point and that it would get cleaned up when it gets cleaned up. > > > > > > > > > > > > > > > > But...I see this higher up in ceph_fill_trace at the end of the > > > > > > > > CEPH_MFS_OP_RENAME condition block: > > > > > > > > > > > > > > > > dn = req->r_old_dentry; /* use old_dentry */ > > > > > > > > > > > > > > > > So now I'm worried about the case where the splice succeeds. ISTM that > > > > > > > > "dn" can represent either r_dentry or r_old_dentry at the point where > > > > > > > > splice_dentry gets called, but we only ever reset the value of r_dentry > > > > > > > > there. > > > > > > > > > > > > > > > > If dn == r_old_dentry at the time that splice_dentry is called, and then > > > > > > > > that succeeds, we'll end up leaking the reference to r_dentry and then > > > > > > > > doing an overput on r_old_dentry. > > > > > > > > > > > > > > > > > > > > > > Good catch > > > > > > > > > > > > > > > I think it might help to establish clear "ownership" of the dentry > > > > > > > > references throughout that function. Consider zeroing out r_dentry and > > > > > > > > r_old_dentry at the time that you set the local variables? That might > > > > > > > > make this whole thing less fragile. > > > > > > > > > > > > > > Before the function return, we need to set req->r_dentry again. This will introduce duplicated code because there are several ‘goto’ in the function. How about following change. > > > > > > > > > > > > > > > > > > > > > - dn = req->r_old_dentry; /* use old_dentry */ > > > > > > > + /* swap r_dentry and r_old_dentry */ > > > > > > > + req->r_dentry = req->r_old_dentry; > > > > > > > + req->r_old_dentry = dn; > > > > > > > + dn = req->r_dentry; > > > > > > > > > > > > > > > > > > > Why do we need to reset r_dentry? I don't see where it gets used after > > > > > > ceph_fill_trace returns, so I gather we're just resetting it to clean up > > > > > > the references? Your proposed fix looks like it would fix that bug. It > > > > > > will mean that the values in the req will change but maybe that's ok. > > > > > > > > > > > > > > > > It’s used by ceph_finish_lookup > > > > > > > > > > > > > In that case, it might be bad idea to overwrite the value of r_dentry > > > > with the r_old_dentry pointer? > > > > > > ceph_finish_lookup() is not used in the rename case ;) > > > > > > > > > > Ok, but still...I worry about this sort of special-casing, as it can > > lead to people making incorrect assumptions later. I think it would be > > best to just take a dentry ref for "dn" and just put it before it goes > > out of scope. > > how about below patch. let splice_dentry() to update req->r_dentry. > > > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index e8ce4e66bc47..739737f4e0e1 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -1106,8 +1106,9 @@ static void update_dentry_lease(struct dentry *dentry, > * splice a dentry to an inode. > * caller must hold directory i_mutex for this to be safe. > */ > -static struct dentry *splice_dentry(struct dentry *dn, struct inode *in) > +static int splice_dentry(struct dentry **pdn, struct inode *in) > { > + struct dentry *dn = *pdn; > struct dentry *realdn; > > BUG_ON(d_inode(dn)); > @@ -1140,28 +1141,23 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in) > if (IS_ERR(realdn)) { > pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", > PTR_ERR(realdn), dn, in, ceph_vinop(in)); > - dn = realdn; > - /* > - * Caller should release 'dn' in the case of error. > - * If 'req->r_dentry' is passed to this function, > - * caller should leave 'req->r_dentry' untouched. > - */ > - goto out; > - } else if (realdn) { > + return PTR_ERR(realdn); > + } > + > + if (realdn) { > dout("dn %p (%d) spliced with %p (%d) " > "inode %p ino %llx.%llx\n", > dn, d_count(dn), > realdn, d_count(realdn), > d_inode(realdn), ceph_vinop(d_inode(realdn))); > dput(dn); > - dn = realdn; > + *pdn = realdn; > } else { > BUG_ON(!ceph_dentry(dn)); > dout("dn %p attached to %p ino %llx.%llx\n", > dn, d_inode(dn), ceph_vinop(d_inode(dn))); > } > -out: > - return dn; > + return 0; > } > > /* > @@ -1348,7 +1344,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) > dout("dn %p gets new offset %lld\n", req->r_old_dentry, > ceph_dentry(req->r_old_dentry)->offset); > > - dn = req->r_old_dentry; /* use old_dentry */ > + /* swap r_dentry and r_old_dentry */ > + req->r_dentry = req->r_old_dentry; > + req->r_old_dentry = dn; > + dn = req->r_dentry; I think the above deserves a comment explaining why this is safe to do for rename ops. > } > > /* null dentry? */ > @@ -1373,12 +1372,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) > if (d_really_is_negative(dn)) { > ceph_dir_clear_ordered(dir); > ihold(in); > - dn = splice_dentry(dn, in); > - if (IS_ERR(dn)) { > - err = PTR_ERR(dn); > + err = splice_dentry(&req->r_dentry, in); > + if (err < 0) > goto done; > - } > - req->r_dentry = dn; /* may have spliced */ > + dn = req->r_dentry; /* may have spliced */ > } else if (d_really_is_positive(dn) && d_inode(dn) != in) { > dout(" %p links to %p %llx.%llx, not %llx.%llx\n", > dn, d_inode(dn), ceph_vinop(d_inode(dn)), > @@ -1398,22 +1395,18 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) > } else if ((req->r_op == CEPH_MDS_OP_LOOKUPSNAP || > req->r_op == CEPH_MDS_OP_MKSNAP) && > !test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags)) { > - struct dentry *dn = req->r_dentry; > struct inode *dir = req->r_parent; > > /* fill out a snapdir LOOKUPSNAP dentry */ > - BUG_ON(!dn); > BUG_ON(!dir); > BUG_ON(ceph_snap(dir) != CEPH_SNAPDIR); > - dout(" linking snapped dir %p to dn %p\n", in, dn); > + BUG_ON(!req->r_dentry); > + dout(" linking snapped dir %p to dn %p\n", in, req->r_dentry); > ceph_dir_clear_ordered(dir); > ihold(in); > - dn = splice_dentry(dn, in); > - if (IS_ERR(dn)) { > - err = PTR_ERR(dn); > + err = splice_dentry(&req->r_dentry, in); > + if (err < 0) > goto done; > - } > - req->r_dentry = dn; /* may have spliced */ > } else if (rinfo->head->is_dentry) { > struct ceph_vino *ptvino = NULL; > > @@ -1677,8 +1670,6 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, > } > > if (d_really_is_negative(dn)) { > - struct dentry *realdn; > - > if (ceph_security_xattr_deadlock(in)) { > dout(" skip splicing dn %p to inode %p" > " (security xattr deadlock)\n", dn, in); > @@ -1687,13 +1678,9 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, > goto next_item; > } > > - realdn = splice_dentry(dn, in); > - if (IS_ERR(realdn)) { > - err = PTR_ERR(realdn); > - d_drop(dn); > + err = splice_dentry(&dn, in); > + if (err < 0) > goto next_item; > - } > - dn = realdn; > } > > ceph_dentry(dn)->offset = rde->offset; > @@ -1709,8 +1696,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, > err = ret; > } > next_item: > - if (dn) > - dput(dn); > + dput(dn); > } > out: > if (err == 0 && skipped == 0) { > The rest seems to be ok. > > > > > At the very least, if you are going to override r_dentry like this, > > please add a comment explaining why it's safe to do this in the rename case. > > > > > > > > > > > > > > > > > Another idea might be to just keep an extra reference to "dn", and not > > > > > > reset r_dentry and r_old_dentry? It's a bit more code, but it might be a > > > > > > cleaner fix, long-term. > > > > > > > > > > I will check, Thanks > > > > > > > > > > Yan, Zheng > > > > > > > > > > > -- > > > > > > Jeff Layton <jlayton(a)redhat.com> > > > > > > > > > > > > > > > > > > -- > > > > Jeff Layton <jlayton(a)redhat.com> > > > > > > > > > > > > > > -- > > Jeff Layton <jlayton(a)redhat.com> > > -- Jeff Layton <jlayton(a)redhat.com>

6 years, 2 months

1
0
0 0

[PATCH] tpm: tpm_try_transmit() refactor error flow.

by Tomas Winkler

First, rename out_no_locality to out_locality for bailing out on both tpm_cmd_ready() and tpm_request_locality() failure. Second, ignore the return value of go_to_idle() as it may override the return value of the actual tpm operation, the go_to_idle() error will be caught on any consequent command. Last, fix the wrong 'goto out', that jumped back instead of forward. Cc: stable(a)vger.kernel.org Fixes: 627448e85c76 ("tpm: separate cmd_ready/go_idle from runtime_pm") Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> --- drivers/char/tpm/tpm-interface.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 129f640424b7..95db630dd722 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -477,13 +477,15 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, if (need_locality) { rc = tpm_request_locality(chip, flags); - if (rc < 0) - goto out_no_locality; + if (rc < 0) { + need_locality = false; + goto out_locality; + } } rc = tpm_cmd_ready(chip, flags); if (rc) - goto out; + goto out_locality; rc = tpm2_prepare_space(chip, space, ordinal, buf); if (rc) @@ -547,14 +549,13 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc); out: - rc = tpm_go_idle(chip, flags); - if (rc) - goto out; + /* may fail but do not override previous error value in rc */ + tpm_go_idle(chip, flags); +out_locality: if (need_locality) tpm_relinquish_locality(chip, flags); -out_no_locality: if (chip->ops->clk_enable != NULL) chip->ops->clk_enable(chip, false); -- 2.14.4

6 years, 2 months

3
8
0 0

[PATCH] hugetlbfs: dirty pages as they are added to pagecache

by Mike Kravetz

Some test systems were experiencing negative huge page reserve counts and incorrect file block counts. This was traced to /proc/sys/vm/drop_caches removing clean pages from hugetlbfs file pagecaches. When non-hugetlbfs explicit code removes the pages, the appropriate accounting is not performed. This can be recreated as follows: fallocate -l 2M /dev/hugepages/foo echo 1 > /proc/sys/vm/drop_caches fallocate -l 2M /dev/hugepages/foo grep -i huge /proc/meminfo AnonHugePages: 0 kB ShmemHugePages: 0 kB HugePages_Total: 2048 HugePages_Free: 2047 HugePages_Rsvd: 18446744073709551615 HugePages_Surp: 0 Hugepagesize: 2048 kB Hugetlb: 4194304 kB ls -lsh /dev/hugepages/foo 4.0M -rw-r--r--. 1 root root 2.0M Oct 17 20:05 /dev/hugepages/foo To address this issue, dirty pages as they are added to pagecache. This can easily be reproduced with fallocate as shown above. Read faulted pages will eventually end up being marked dirty. But there is a window where they are clean and could be impacted by code such as drop_caches. So, just dirty them all as they are added to the pagecache. In addition, it makes little sense to even try to drop hugetlbfs pagecache pages, so disable calls to these filesystems in drop_caches code. Fixes: 70c3547e36f5 ("hugetlbfs: add hugetlbfs_fallocate()") Cc: stable(a)vger.kernel.org Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> --- fs/drop_caches.c | 7 +++++++ mm/hugetlb.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/fs/drop_caches.c b/fs/drop_caches.c index 82377017130f..b72c5bc502a8 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -9,6 +9,7 @@ #include <linux/writeback.h> #include <linux/sysctl.h> #include <linux/gfp.h> +#include <linux/magic.h> #include "internal.h" /* A global variable is a bit ugly, but it keeps the code simple */ @@ -18,6 +19,12 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) { struct inode *inode, *toput_inode = NULL; + /* + * It makes no sense to try and drop hugetlbfs page cache pages. + */ + if (sb->s_magic == HUGETLBFS_MAGIC) + return; + spin_lock(&sb->s_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { spin_lock(&inode->i_lock); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5c390f5a5207..7b5c0ad9a6bd 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3690,6 +3690,12 @@ int huge_add_to_page_cache(struct page *page, struct address_space *mapping, return err; ClearPagePrivate(page); + /* + * set page dirty so that it will not be removed from cache/file + * by non-hugetlbfs specific code paths. + */ + set_page_dirty(page); + spin_lock(&inode->i_lock); inode->i_blocks += blocks_per_huge_page(h); spin_unlock(&inode->i_lock); -- 2.17.2

6 years, 2 months

5
9
0 0

[PATCH 1/4] Revert "ceph: fix dentry leak in splice_dentry()"

by Yan, Zheng

This reverts commit 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3. splice_dentry() is used by three places. For two places, req->r_dentry is passed to splice_dentry(). In the case of error, req->r_dentry does not get updated. So splice_dentry() should not drop reference. Cc: stable(a)vger.kernel.org #4.18 Signed-off-by: "Yan, Zheng" <zyan(a)redhat.com> --- fs/ceph/inode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index c6bbb7aa99e4..375924b2bc86 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1140,7 +1140,6 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in) if (IS_ERR(realdn)) { pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", PTR_ERR(realdn), dn, in, ceph_vinop(in)); - dput(dn); dn = realdn; /* note realdn contains the error */ goto out; } else if (realdn) { -- 2.17.1

6 years, 2 months

4
10
0 0

[RESEND PATCH v2 2/2] drm/i915/mst: Reset MST after resume when necessary

by Juston Li

From: Lyude <cpaul(a)redhat.com> A follow-up to the previous commit, we skip checking the status of the MST device and completely reprobe it if drm_dp_mst_topology_mgr_resume() returns -EINVAL. Cc: stable(a)vger.kernel.org Signed-off-by: Lyude <cpaul(a)redhat.com> Signed-off-by: Juston Li <juston.li(a)intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 8c38efef77a1..cb5ffec73094 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -6793,7 +6793,12 @@ void intel_dp_mst_resume(struct drm_i915_private *dev_priv) continue; ret = drm_dp_mst_topology_mgr_resume(&intel_dp->mst_mgr); - if (ret) + /* A full reset is required */ + if (ret == -EINVAL) { + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, false); + intel_dp_configure_mst(intel_dp); + } else if (ret != 0) { intel_dp_check_mst_status(intel_dp); + } } } -- 2.17.2

6 years, 2 months

1
0
0 0

[PATCH stable v2 1/2] termios, tty/tty_baudrate.c: fix buffer overrun

by H. Peter Anvin (Intel)

From: "H. Peter Anvin" <hpa(a)zytor.com> On architectures with CBAUDEX == 0 (Alpha and PowerPC), the code in tty_baudrate.c does not do any limit checking on the tty_baudrate[] array, and in fact a buffer overrun is possible on both architectures. Add a limit check to prevent that situation. This will be followed by a much bigger cleanup/simplification patch. Signed-off-by: H. Peter Anvin (Intel) <hpa(a)zytor.com> Requested-by: Cc: Johan Hovold <johan(a)kernel.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Jiri Slaby <jslaby(a)suse.com> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Ivan Kokshaysky <ink(a)jurassic.park.msu.ru> Cc: Matt Turner <mattst88(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Kate Stewart <kstewart(a)linuxfoundation.org> Cc: Philippe Ombredanne <pombredanne(a)nexb.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Eugene Syromiatnikov <esyr(a)redhat.com> Cc: <linux-alpha(a)vger.kernel.org> Cc: <linux-serial(a)vger.kernel.org> Cc: Alan Cox <alan(a)lxorguk.ukuu.org.uk> Cc: <stable(a)vger.kernel.org> --- drivers/tty/tty_baudrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/tty_baudrate.c b/drivers/tty/tty_baudrate.c index 7576ceace571..f438eaa68246 100644 --- a/drivers/tty/tty_baudrate.c +++ b/drivers/tty/tty_baudrate.c @@ -77,7 +77,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios) else cbaud += 15; } - return baud_table[cbaud]; + return cbaud >= n_baud_table ? 0 : baud_table[cbaud]; } EXPORT_SYMBOL(tty_termios_baud_rate); @@ -113,7 +113,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios) else cbaud += 15; } - return baud_table[cbaud]; + return cbaud >= n_baud_table ? 0 : baud_table[cbaud]; #else /* IBSHIFT */ return tty_termios_baud_rate(termios); #endif /* IBSHIFT */ -- 2.14.4

6 years, 2 months

4
4
0 0

[PATCH V2] MIPS: VDSO: Reduce VDSO_RANDOMIZE_SIZE to 64MB for 64bit

by Huacai Chen

Commit ea7e0480a4b695d0aa6b3 ("MIPS: VDSO: Always map near top of user memory") set VDSO_RANDOMIZE_SIZE to 256MB for 64bit kernel. But take a look at arch/mips/mm/mmap.c we can see that MIN_GAP is 128MB, which means the mmap_base may be at (user_address_top - 128MB). This make the stack be surrounded by mmaped areas, then stack expanding fails and causes a segmentation fault. Therefore, VDSO_RANDOMIZE_SIZE should be less than MIN_GAP and this patch reduce it to 64MB. By the way, not all VDSO_RANDOMIZE_SIZE can be used for vdso_base() randomization because VDSO need some room to locate itself (in this patch we reserve 64KB). Cc: stable(a)vger.kernel.org Fixes: ea7e0480a4b695d0aa ("MIPS: VDSO: Always map near top of user memory") Signed-off-by: Huacai Chen <chenhc(a)lemote.com> --- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/vdso.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 49d6046..c373eb6 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h @@ -81,7 +81,7 @@ extern unsigned int vced_count, vcei_count; #endif -#define VDSO_RANDOMIZE_SIZE (TASK_IS_32BIT_ADDR ? SZ_1M : SZ_256M) +#define VDSO_RANDOMIZE_SIZE (TASK_IS_32BIT_ADDR ? SZ_1M : SZ_64M) extern unsigned long mips_stack_top(void); #define STACK_TOP mips_stack_top() diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index 48a9c6b..d6232d9 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -106,7 +106,7 @@ static unsigned long vdso_base(void) base = STACK_TOP + PAGE_SIZE; if (current->flags & PF_RANDOMIZE) { - base += get_random_int() & (VDSO_RANDOMIZE_SIZE - 1); + base += get_random_int() & (VDSO_RANDOMIZE_SIZE - SZ_64K - 1); base = PAGE_ALIGN(base); } -- 2.7.0

6 years, 2 months

2
1
0 0

[PATCH AUTOSEL 4.18 01/27] ARM: dts: imx53-qsb: disable 1.2GHz OPP

by Sasha Levin

From: Sascha Hauer <s.hauer(a)pengutronix.de> [ Upstream commit eea96566c189c77e5272585984eb2729881a2f1d ] The maximum CPU frequency for the i.MX53 QSB is 1GHz, so disable the 1.2GHz OPP. This makes the board work again with configs that have cpufreq enabled like imx_v6_v7_defconfig on which the board stopped working with the addition of cpufreq-dt support. Fixes: 791f416608 ("ARM: dts: imx53: add cpufreq-dt support") Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/boot/dts/imx53-qsb-common.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index ef7658a78836..c1548adee789 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi @@ -123,6 +123,17 @@ }; }; +&cpu0 { + /* CPU rated to 1GHz, not 1.2GHz as per the default settings */ + operating-points = < + /* kHz uV */ + 166666 850000 + 400000 900000 + 800000 1050000 + 1000000 1200000 + >; +}; + &esdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; -- 2.17.1

6 years, 2 months

2
30
0 0

[PATCH] DRM: UDL: get rid of useless vblank initialization

by Eugeniy Paltsev

UDL doesn't support vblank functionality so we don't need to initialize vblank here (we are able to send page flip completion events even without vblank initialization) Moreover current drm_vblank_init call with num_crtcs > 0 causes sending DRM_EVENT_FLIP_COMPLETE event with zero timestamp every time. This breaks userspace apps (for example weston) which relies on timestamp value. Cc: stable(a)vger.kernel.org Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- drivers/gpu/drm/udl/udl_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index f455f095a146..1b014d92855b 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -350,15 +350,10 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags) if (ret) goto err; - ret = drm_vblank_init(dev, 1); - if (ret) - goto err_fb; - drm_kms_helper_poll_init(dev); return 0; -err_fb: - udl_fbdev_cleanup(dev); + err: if (udl->urbs.count) udl_free_urb_list(dev); -- 2.14.4

6 years, 2 months

3
3
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2018